Skip to content

Commit e26c28e

Browse files
mbussolottombussolotto
committed
Clean up and refactor
1 parent 576bbb3 commit e26c28e

15 files changed

Lines changed: 42 additions & 63 deletions

File tree

‎mgradm/cmd/install/podman/utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,20 @@ func installForPodman(
138138
}
139139

140140
if err := coco.SetupCocoContainer(
141-
systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
141+
systemd, authFile, flags.Coco, flags.Image,
142142
flags.Installation.DB,
143143
); err != nil {
144144
return err
145145
}
146146

147147
if err := hub.SetupHubXmlrpc(
148-
systemd, authFile, flags.Image.Registry, flags.Image.PullPolicy, flags.Image.Tag, flags.HubXmlrpc,
148+
systemd, authFile, flags.Image.PullPolicy, flags.HubXmlrpc,
149149
); err != nil {
150150
return err
151151
}
152152

153153
if err := saline.SetupSalineContainer(
154-
systemd, authFile, flags.Image.Registry, flags.Saline, flags.Image, flags.Installation.TZ,
154+
systemd, authFile, flags.Saline, flags.Image, flags.Installation.TZ,
155155
); err != nil {
156156
return err
157157
}

‎mgradm/cmd/migrate/podman/utils.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func migrateToPodman(
4444

4545
return podman.Migrate(
4646
systemd, authFile,
47-
flags.Image.Registry,
4847
flags.Installation.DB,
4948
flags.Installation.ReportDB,
5049
flags.Installation.SSL,

‎mgradm/cmd/support/ptf/podman/utils.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func ptfForPodman(
5050
}
5151

5252
return podman.Upgrade(systemd, authFile,
53-
"",
5453
dummyDB,
5554
dummyReportDB,
5655
dummySSL,

‎mgradm/cmd/upgrade/podman/utils.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ func upgradePodman(_ *types.GlobalFlags, flags *podmanUpgradeFlags, cmd *cobra.C
3838

3939
return podman.Upgrade(
4040
systemd, authFile,
41-
flags.Image.Registry,
4241
flags.Installation.DB,
4342
flags.Installation.ReportDB,
4443
flags.Installation.SSL,

‎mgradm/shared/coco/coco.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
func Upgrade(
2121
systemd podman.Systemd,
2222
authFile string,
23-
registry string,
2423
cocoFlags adm_utils.CocoFlags,
2524
baseImage types.ImageFlags,
2625
db adm_utils.DBFlags,
@@ -38,7 +37,7 @@ func Upgrade(
3837
}
3938

4039
if err := writeCocoServiceFiles(
41-
systemd, authFile, registry, cocoFlags, baseImage, db,
40+
systemd, authFile, cocoFlags, baseImage, db,
4241
); err != nil {
4342
return err
4443
}
@@ -52,7 +51,6 @@ func Upgrade(
5251
func writeCocoServiceFiles(
5352
systemd podman.Systemd,
5453
authFile string,
55-
registry string,
5654
cocoFlags adm_utils.CocoFlags,
5755
baseImage types.ImageFlags,
5856
db adm_utils.DBFlags,
@@ -121,13 +119,12 @@ Environment=database_connection=jdbc:postgresql://%s:%d/%s
121119
func SetupCocoContainer(
122120
systemd podman.Systemd,
123121
authFile string,
124-
registry string,
125122
coco adm_utils.CocoFlags,
126123
baseImage types.ImageFlags,
127124
db adm_utils.DBFlags,
128125
) error {
129126
if err := writeCocoServiceFiles(
130-
systemd, authFile, registry, coco, baseImage, db,
127+
systemd, authFile, coco, baseImage, db,
131128
); err != nil {
132129
return err
133130
}

‎mgradm/shared/hub/xmlrpcapi.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ import (
2121
func SetupHubXmlrpc(
2222
systemd podman.Systemd,
2323
authFile string,
24-
registry string,
2524
pullPolicy string,
26-
tag string,
2725
hubXmlrpcFlags cmd_utils.HubXmlrpcFlags,
2826
) error {
2927
image := hubXmlrpcFlags.Image
@@ -80,16 +78,14 @@ func EnableHubXmlrpc(systemd podman.Systemd, replicas int) error {
8078
func Upgrade(
8179
systemd podman.Systemd,
8280
authFile string,
83-
registry string,
8481
pullPolicy string,
85-
tag string,
8682
hubXmlrpcFlags cmd_utils.HubXmlrpcFlags,
8783
) error {
8884
if hubXmlrpcFlags.Image.Name == "" {
8985
// Don't touch the hub service in ptf if not already present.
9086
return nil
9187
}
92-
if err := SetupHubXmlrpc(systemd, authFile, registry, pullPolicy, tag, hubXmlrpcFlags); err != nil {
88+
if err := SetupHubXmlrpc(systemd, authFile, pullPolicy, hubXmlrpcFlags); err != nil {
9389
return err
9490
}
9591

‎mgradm/shared/kubernetes/dbUpgradeJob.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const DBUpgradeJobName = "uyuni-db-upgrade"
2626
// StartDBUpgradeJob starts the database upgrade job.
2727
func StartDBUpgradeJob(
2828
namespace string,
29-
registry string,
3029
image types.ImageFlags,
3130
migrationImage types.ImageFlags,
3231
pullSecret string,

‎mgradm/shared/kubernetes/reconcile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func Reconcile(flags *KubernetesServerFlags, fqdn string) error {
144144
// Run the DB Upgrade job if needed
145145
if oldPgVersion < newPgVersion {
146146
jobName, err := StartDBUpgradeJob(
147-
namespace, flags.Image.Registry, flags.Image, flags.DBUpgradeImage, pullSecret,
147+
namespace, flags.Image, flags.DBUpgradeImage, pullSecret,
148148
oldPgVersion, newPgVersion,
149149
)
150150
if err != nil {

‎mgradm/shared/podman/podman.go‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ func RunMigration(
183183
// RunPgsqlVersionUpgrade perform a PostgreSQL major upgrade.
184184
func RunPgsqlVersionUpgrade(
185185
authFile string,
186-
registry string,
187186
image types.ImageFlags,
188187
upgradeImage types.ImageFlags,
189188
oldPgsql string,
@@ -296,7 +295,6 @@ func RunPostUpgradeScript(serverImage string) error {
296295
func Upgrade(
297296
systemd podman.Systemd,
298297
authFile string,
299-
registry string,
300298
db adm_utils.DBFlags,
301299
reportdb adm_utils.DBFlags,
302300
ssl adm_utils.InstallSSLFlags,
@@ -311,7 +309,7 @@ func Upgrade(
311309
) error {
312310
// Calling cloudguestregistryauth only makes sense if using the cloud provider registry.
313311
// This check assumes users won't use custom registries that are not the cloud provider one on a cloud image.
314-
if !strings.HasPrefix(registry, "registry.suse.com") {
312+
if image.RegistryFQDN == "registry.suse.com" {
315313
if err := CallCloudGuestRegistryAuth(); err != nil {
316314
return err
317315
}
@@ -372,7 +370,7 @@ func Upgrade(
372370

373371
if newPgVersion > oldPgVersion {
374372
if err := RunPgsqlVersionUpgrade(
375-
authFile, registry, image, upgradeImage, strconv.Itoa(oldPgVersion),
373+
authFile, image, upgradeImage, strconv.Itoa(oldPgVersion),
376374
strconv.Itoa(newPgVersion),
377375
); err != nil {
378376
return utils.Errorf(err, L("cannot run PostgreSQL version upgrade script"))
@@ -440,19 +438,19 @@ func Upgrade(
440438
Host: db.Host,
441439
}
442440

443-
err = coco.Upgrade(systemd, authFile, registry, cocoFlags, image, inspectedDB)
441+
err = coco.Upgrade(systemd, authFile, cocoFlags, image, inspectedDB)
444442

445443
if err != nil {
446444
return utils.Errorf(err, L("error upgrading confidential computing service."))
447445
}
448446

449447
if err := hub.Upgrade(
450-
systemd, authFile, registry, image.PullPolicy, image.Tag, hubXmlrpcFlags,
448+
systemd, authFile, image.PullPolicy, hubXmlrpcFlags,
451449
); err != nil {
452450
return err
453451
}
454452

455-
if err := saline.Upgrade(systemd, authFile, registry, salineFlags, image, utils.GetLocalTimezone()); err != nil {
453+
if err := saline.Upgrade(systemd, authFile, salineFlags, image, utils.GetLocalTimezone()); err != nil {
456454
return utils.Errorf(err, L("error upgrading saline service."))
457455
}
458456

@@ -487,7 +485,6 @@ func WaitForSystemStart(
487485
func Migrate(
488486
systemd podman.Systemd,
489487
authFile string,
490-
registry string,
491488
db adm_utils.DBFlags,
492489
reportdb adm_utils.DBFlags,
493490
ssl adm_utils.InstallSSLFlags,
@@ -508,7 +505,7 @@ func Migrate(
508505
) error {
509506
// Calling cloudguestregistryauth only makes sense if using the cloud provider registry.
510507
// This check assumes users won't use custom registries that are not the cloud provider one on a cloud image.
511-
if !strings.HasPrefix(registry, "registry.suse.com") {
508+
if image.RegistryFQDN == "registry.suse.com" {
512509
if err := CallCloudGuestRegistryAuth(); err != nil {
513510
return err
514511
}
@@ -570,7 +567,7 @@ func Migrate(
570567
log.Info().Msgf(L("Configuring split PostgreSQL container. Image version: %[1]d, not migrated version: %[2]d"),
571568
newPgVersion, oldPgVersion)
572569

573-
if err := upgradeDB(newPgVersion, oldPgVersion, upgradeImage, authFile, registry, image); err != nil {
570+
if err := upgradeDB(newPgVersion, oldPgVersion, upgradeImage, authFile, image); err != nil {
574571
return err
575572
}
576573

@@ -607,18 +604,18 @@ func Migrate(
607604
Host: db.Host,
608605
}
609606

610-
err = coco.Upgrade(systemd, authFile, registry, cocoFlags, image, inspectedDB)
607+
err = coco.Upgrade(systemd, authFile, cocoFlags, image, inspectedDB)
611608
if err != nil {
612609
return utils.Errorf(err, L("error upgrading confidential computing service."))
613610
}
614611

615612
if err := hub.Upgrade(
616-
systemd, authFile, registry, image.PullPolicy, image.Tag, hubXmlrpcFlags,
613+
systemd, authFile, image.PullPolicy, hubXmlrpcFlags,
617614
); err != nil {
618615
return err
619616
}
620617

621-
if err := saline.Upgrade(systemd, authFile, registry, salineFlags, image, utils.GetLocalTimezone()); err != nil {
618+
if err := saline.Upgrade(systemd, authFile, salineFlags, image, utils.GetLocalTimezone()); err != nil {
622619
return utils.Errorf(err, L("error upgrading saline service."))
623620
}
624621

@@ -774,7 +771,6 @@ func prepareHost(
774771
preparedPgsqlImage types.ImageFlags,
775772
scc types.SCCCredentials,
776773
) (*utils.ServerInspectData, error) {
777-
778774
inspectedValues, err := podman.Inspect(preparedServerImage, preparedPgsqlImage, scc)
779775
if err != nil {
780776
return nil, utils.Errorf(err, L("cannot inspect podman values"))
@@ -797,12 +793,11 @@ func upgradeDB(
797793
oldPgVersion int,
798794
upgradeImage types.ImageFlags,
799795
authFile string,
800-
registry string,
801796
image types.ImageFlags,
802797
) error {
803798
if newPgVersion > oldPgVersion {
804799
if err := RunPgsqlVersionUpgrade(
805-
authFile, registry, image, upgradeImage, strconv.Itoa(oldPgVersion),
800+
authFile, image, upgradeImage, strconv.Itoa(oldPgVersion),
806801
strconv.Itoa(newPgVersion),
807802
); err != nil {
808803
return utils.Error(err, L("cannot run PostgreSQL version upgrade script"))

‎mgradm/shared/saline/saline.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ import (
2121
func Upgrade(
2222
systemd podman.Systemd,
2323
authFile string,
24-
registry string,
2524
salineFlags adm_utils.SalineFlags,
2625
baseImage types.ImageFlags,
2726
tz string,
2827
) error {
2928
if err := writeSalineServiceFiles(
30-
systemd, authFile, registry, salineFlags, baseImage, tz,
29+
systemd, authFile, salineFlags, baseImage, tz,
3130
); err != nil {
3231
return err
3332
}
@@ -47,7 +46,6 @@ func Upgrade(
4746
func writeSalineServiceFiles(
4847
systemd podman.Systemd,
4948
authFile string,
50-
registry string,
5149
salineFlags adm_utils.SalineFlags,
5250
baseImage types.ImageFlags,
5351
tz string,
@@ -122,12 +120,11 @@ func writeSalineServiceFiles(
122120
func SetupSalineContainer(
123121
systemd podman.Systemd,
124122
authFile string,
125-
registry string,
126123
salineFlags adm_utils.SalineFlags,
127124
baseImage types.ImageFlags,
128125
tz string,
129126
) error {
130-
if err := writeSalineServiceFiles(systemd, authFile, registry, salineFlags, baseImage, tz); err != nil {
127+
if err := writeSalineServiceFiles(systemd, authFile, salineFlags, baseImage, tz); err != nil {
131128
return err
132129
}
133130
return EnableSaline(systemd, salineFlags.Replicas)

0 commit comments

Comments
 (0)