Merge pull request #1389 from Azure/refactor-image-references

Refacotring Image references
Azure · Feb 24, 2025 · 2106a93 · 2106a93
2 parents 13fe085 + 0c08275
commit 2106a93
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 27 deletions.
diff --git a/.github/workflows/helm-lint.yml b/.github/workflows/helm-lint.yml
@@ -63,4 +63,3 @@ jobs:
             --all \
             --validate-maintainers=false \
             --target-branch ${{ github.event.repository.default_branch }}
-            --debug=${{ inputs.debug }}
diff --git a/cluster-service/Makefile b/cluster-service/Makefile
@@ -43,7 +43,7 @@ deploy:
 	  --set serviceKeyvaultName=${SERVICE_KV} \
 	  --set imageRegistry=${ACR_NAME}.azurecr.io \
 	  --set imageRepository=${IMAGE_REPO} \
-	  --set imageTag=${IMAGE_TAG} \
+	  --set imageDigest=${IMAGE_DIGEST} \
 	  --set azureFirstPartyApplicationClientId=${AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID} \
 	  --set fpaCertName=${FPA_CERT_NAME} \
 	  --set ocpAcrResourceId=$${OCP_ACR_RESOURCE_ID} \

diff --git a/cluster-service/deploy/helm/templates/deployment.yaml b/cluster-service/deploy/helm/templates/deployment.yaml
@@ -78,7 +78,7 @@ spec:
             secretProviderClass: cs-keyvault
       initContainers:
       - name: init
-        image: '{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}'
+        image: '{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}@{{ .Values.imageDigest }}'
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: rds

diff --git a/cluster-service/deploy/helm/values.yaml b/cluster-service/deploy/helm/values.yaml
@@ -34,8 +34,8 @@ imageRegistry: ""
 # Image Repository
 imageRepository: ""
 
-# Image Tag
-imageTag: ""
+# Image Digest
+imageDigest: ""
 
 # log verbosity level
 logLevel: "debug"

diff --git a/cluster-service/pipeline.yaml b/cluster-service/pipeline.yaml
@@ -25,9 +25,9 @@ resourceGroups:
     - name: OIDC_STORAGE_ACCOUNT
       configRef: oidcStorageAccountName
     - name: IMAGE_REPO
-      configRef: clusterService.imageRepo
-    - name: IMAGE_TAG
-      configRef: clusterService.imageTag
+      configRef: clusterService.image.repository
+    - name: IMAGE_DIGEST
+      configRef: clusterService.image.digest
     - name: ACR_NAME
       configRef: svcAcrName
     - name: OCP_ACR_NAME

diff --git a/config/config.msft.yaml b/config/config.msft.yaml
@@ -103,7 +103,8 @@ defaults:
 
   # Cluster Service
   clusterService:
-    imageRepo: app-sre/uhc-clusters-service
+    image:
+      repository: app-sre/uhc-clusters-service
     azureOperatorsManagedIdentities:
       cloudControllerManager:
         roleName: Azure Red Hat OpenShift Cloud Controller Manager
@@ -204,7 +205,8 @@ clouds:
       maestro:
         imageTag: c9a36e110a32c0c25aa5025cfe6d51af797e6d4b
       clusterService:
-        imageTag: 9fd02a4
+        image:
+          digest: sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0
       hypershiftOperator:
         imageTag: 1bb8b1a
       imageSync:

diff --git a/config/config.schema.json b/config/config.schema.json
@@ -97,6 +97,20 @@
           "systemAgentPool"
         ]
       },
+      "containerImage": {
+        "type": "object",
+        "properties": {
+          "repository": {
+            "type": "string"
+          },
+          "digest": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "repository"
+        ]
+      },
       "keyColonValueCSV": {
         "type": "string",
         "pattern": "^$|^[\\w-\\.]+:[\\w\\/-]+(,[\\w-\\.]+:[\\w\\/-]+)*$"
@@ -186,11 +200,8 @@
             "minLength": 1,
             "maxLength": 10
           },
-          "imageRepo": {
-            "type": "string"
-          },
-          "imageTag": {
-            "type": "string"
+          "image": {
+            "$ref": "#/definitions/containerImage"
           },
           "managedIdentityName": {
             "type": "string",
@@ -284,8 +295,7 @@
         "additionalProperties": false,
         "required": [
           "environment",
-          "imageRepo",
-          "imageTag",
+          "image",
           "managedIdentityName",
           "k8s",
           "azureOperatorsManagedIdentities",

diff --git a/config/config.yaml b/config/config.yaml
@@ -106,6 +106,8 @@ defaults:
 
   # Cluster Service
   clusterService:
+    image:
+      repository: app-sre/uhc-clusters-service
     environment: arohcpdev
     postgres:
       name: arohcp-cs-{{ .ctx.regionShort }}
@@ -192,8 +194,8 @@ clouds:
         imageTag: 8244a76cbc7d020192648b17ac7b7467abf1f2cb
       # Cluster Service
       clusterService:
-        imageTag: 9fd02a4
-        imageRepo: app-sre/uhc-clusters-service
+        image:
+          digest: sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0
         azureOperatorsManagedIdentities:
           clusterApiAzure:
             roleName: Azure Red Hat OpenShift Control Plane Operator Role - Dev

diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
@@ -38,8 +38,10 @@
       }
     },
     "environment": "arohcpdev",
-    "imageRepo": "app-sre/uhc-clusters-service",
-    "imageTag": "9fd02a4",
+    "image": {
+      "digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
+      "repository": "app-sre/uhc-clusters-service"
+    },
     "k8s": {
       "namespace": "cluster-service",
       "serviceAccountName": "clusters-service"

diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
@@ -38,8 +38,10 @@
       }
     },
     "environment": "arohcpdev",
-    "imageRepo": "app-sre/uhc-clusters-service",
-    "imageTag": "9fd02a4",
+    "image": {
+      "digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
+      "repository": "app-sre/uhc-clusters-service"
+    },
     "k8s": {
       "namespace": "cluster-service",
       "serviceAccountName": "clusters-service"

diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json
@@ -38,8 +38,10 @@
       }
     },
     "environment": "arohcpint",
-    "imageRepo": "app-sre/uhc-clusters-service",
-    "imageTag": "9fd02a4",
+    "image": {
+      "digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
+      "repository": "app-sre/uhc-clusters-service"
+    },
     "k8s": {
       "namespace": "cluster-service",
       "serviceAccountName": "clusters-service"

diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json
@@ -38,8 +38,10 @@
       }
     },
     "environment": "arohcpdev",
-    "imageRepo": "app-sre/uhc-clusters-service",
-    "imageTag": "9fd02a4",
+    "image": {
+      "digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
+      "repository": "app-sre/uhc-clusters-service"
+    },
     "k8s": {
       "namespace": "cluster-service",
       "serviceAccountName": "clusters-service"