Skip to content

Commit 3b320e2

Browse files
deneb-alphadeneb-alpha
authored
Merge pull request #576 from cbosdo/saline-ptf
Add saline and db image support to mgradm support ptf
2 parents 69ce72e + 496897d commit 3b320e2

File tree

4 files changed

+50
-28
lines changed

4 files changed

+50
-28
lines changed

‎mgradm/cmd/support/config/extractor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 SUSE LLC
1+
// SPDX-FileCopyrightText: 2025 SUSE LLC
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,27 +100,24 @@ func (flags *podmanPTFFlags) checkParameters() error {
100100
}
101101
log.Info().Msgf(L("The computed image is %s"), flags.Image.Name)
102102

103-
if cocoImage := getServiceImage(podman_shared.ServerAttestationService + "@"); cocoImage != "" {
104-
// If no coco image was found then skip it during the upgrade.
105-
cocoImage, err = utils.ComputePTF(flags.CustomerID, projectID, cocoImage, suffix)
106-
if err != nil {
107-
return err
108-
}
109-
if hasRemoteImage(cocoImage) {
110-
flags.Coco.Image.Name = cocoImage
111-
log.Info().Msgf(L("The computed confidential computing image is %s"), flags.Coco.Image.Name)
112-
}
103+
images := map[string]*string{
104+
podman_shared.ServerAttestationService + "@": &flags.Coco.Image.Name,
105+
podman_shared.HubXmlrpcService: &flags.HubXmlrpc.Image.Name,
106+
podman_shared.SalineService: &flags.Saline.Image.Name,
107+
podman_shared.DBService: &flags.Pgsql.Image.Name,
113108
}
114109

115-
if hubImage := getServiceImage(podman_shared.HubXmlrpcService); hubImage != "" {
116-
// If no hub xmlrpc api image was found then skip it during the upgrade.
117-
hubImage, err = utils.ComputePTF(flags.CustomerID, projectID, hubImage, suffix)
118-
if err != nil {
119-
return err
120-
}
121-
if hasRemoteImage(hubImage) {
122-
flags.HubXmlrpc.Image.Name = hubImage
123-
log.Info().Msgf(L("The computed hub XML-RPC API image is %s"), flags.HubXmlrpc.Image.Name)
110+
for service, pointer := range images {
111+
if containerImage := getServiceImage(service); containerImage != "" {
112+
// If no image was found then skip it during the upgrade.
113+
containerImage, err = utils.ComputePTF(flags.CustomerID, projectID, containerImage, suffix)
114+
if err != nil {
115+
return err
116+
}
117+
if hasRemoteImage(containerImage) {
118+
*pointer = containerImage
119+
log.Info().Msgf(L("The %[1]s service image is %[2]s"), service, *pointer)
120+
}
124121
}
125122
}
126123

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

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,67 @@ import (
1414
)
1515

1616
func TestCheckParameters(t *testing.T) {
17-
createServiceImages := func(image string, cocoImage string, hubImage string) map[string]string {
17+
createServiceImages := func(
18+
image string, cocoImage string, hubImage string, salineImage string, dbImage string,
19+
) map[string]string {
1820
return map[string]string{
1921
podman.ServerService: image,
2022
podman.ServerAttestationService + "@": cocoImage,
2123
podman.HubXmlrpcService: hubImage,
24+
podman.SalineService: salineImage,
25+
podman.DBService: dbImage,
2226
}
2327
}
2428
type testData struct {
25-
serviceImages map[string]string
26-
hasRemoteImages map[string]bool
27-
expectedImage string
28-
expectedCocoImage string
29-
expectedHubImage string
30-
expectedError string
29+
serviceImages map[string]string
30+
hasRemoteImages map[string]bool
31+
expectedImage string
32+
expectedCocoImage string
33+
expectedHubImage string
34+
expectedSalineImage string
35+
expectedDBImage string
36+
expectedError string
3137
}
3238

3339
data := []testData{
3440
{
35-
createServiceImages("registry.suse.com/suse/manager/5.0/x86_64/server:5.0.0", "", ""),
41+
createServiceImages("registry.suse.com/suse/manager/5.0/x86_64/server:5.0.0", "", "", "", ""),
3642
map[string]bool{},
3743
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server:latest-ptf-5678",
3844
"",
3945
"",
4046
"",
47+
"",
48+
"",
4149
},
4250
{
4351
createServiceImages(
4452
"registry.suse.com/suse/manager/5.0/x86_64/server:5.0.0",
4553
"registry.suse.com/suse/manager/5.0/x86_64/server-attestation:5.0.0",
4654
"registry.suse.com/suse/manager/5.0/x86_64/server-hub-xmlrpc-api:5.0.0",
55+
"registry.suse.com/suse/manager/5.0/x86_64/server-saline:5.0.0",
56+
"registry.suse.com/suse/manager/5.0/x86_64/server-postgresql:5.0.0",
4757
),
4858
map[string]bool{
4959
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-attestation:latest-ptf-5678": true,
5060
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-hub-xmlrpc-api:latest-ptf-5678": true,
61+
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-saline:latest-ptf-5678": true,
62+
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-postgresql:latest-ptf-5678": true,
5163
},
5264
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server:latest-ptf-5678",
5365
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-attestation:latest-ptf-5678",
5466
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-hub-xmlrpc-api:latest-ptf-5678",
67+
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-saline:latest-ptf-5678",
68+
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-postgresql:latest-ptf-5678",
5569
"",
5670
},
5771
{
5872
createServiceImages(
5973
"registry.suse.com/suse/manager/5.0/x86_64/server:5.0.0",
6074
"registry.suse.com/suse/manager/5.0/x86_64/server-attestation:5.0.0",
6175
"",
76+
"",
77+
"",
6278
),
6379
map[string]bool{
6480
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server:latest-ptf-5678": true,
@@ -68,19 +84,25 @@ func TestCheckParameters(t *testing.T) {
6884
"",
6985
"",
7086
"",
87+
"",
88+
"",
7189
},
7290
{
7391
createServiceImages(
7492
"",
7593
"",
7694
"registry.suse.com/suse/manager/5.0/x86_64/server-hub-xmlrpc-api:5.0.0",
95+
"",
96+
"",
7797
),
7898
map[string]bool{
7999
"registry.suse.com/a/1234/5678/suse/manager/5.0/x86_64/server-hub-xmlrpc-api:latest-ptf-5678": true,
80100
},
81101
"",
82102
"",
83103
"",
104+
"",
105+
"",
84106
"failed to find server image",
85107
},
86108
}
@@ -109,5 +131,7 @@ func TestCheckParameters(t *testing.T) {
109131
testutils.AssertEquals(t, testCase+"unexpected image", test.expectedImage, flags.Image.Name)
110132
testutils.AssertEquals(t, testCase+"unexpected coco image", test.expectedCocoImage, flags.Coco.Image.Name)
111133
testutils.AssertEquals(t, testCase+"unexpected hub image", test.expectedHubImage, flags.HubXmlrpc.Image.Name)
134+
testutils.AssertEquals(t, testCase+"unexpected saline image", test.expectedSalineImage, flags.Saline.Image.Name)
135+
testutils.AssertEquals(t, testCase+"unexpected db image", test.expectedDBImage, flags.Pgsql.Image.Name)
112136
}
113137
}

‎uyuni-tools.changes.cbosdo.saline-ptf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Patch saline and database images if needed mgradm support ptf

0 commit comments

Comments
 (0)