update image sync to support ACR to ACR sync (#972)

* update image sync version to use for MSFT INT * sync RP and image sync images into INT ACR
Azure · Dec 13, 2024 · f04f10d · f04f10d
1 parent 8d3c113
commit f04f10d
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 18 deletions.
diff --git a/config/config.msft.yaml b/config/config.msft.yaml
@@ -84,11 +84,13 @@ defaults:
     componentSync:
       enabled: true
       imageRepo: image-sync/component-sync
-      repositories: quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package
-      secrets: ""
+      repositories: arohcpsvcdev.azurecr.io/image-sync,arohcpsvcdev.azurecr.io/arohcpfrontend,arohcpsvcdev.azurecr.io/arohcpbackend,quay.io/acm-d/rhtap-hypershift-operator,arohcpsvcdev.azurecr.io/image-sync/oc-mirror,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package
+      secrets: '[{"registry": "quay.io", "secret": "quay-io-bearer"},{"registry": "arohcpsvcdev.azurecr.io", "secret": "arohcpsvcdev-bearer"}]'
+      pullSecretName: component-sync-pull-secret
     ocMirror:
       enabled: true
       imageRepo: image-sync/oc-mirror
+      pullSecretName: ocp-pull-secret
     keyVault:
       name: arohcp-imagesync-int
       private: false
@@ -139,7 +141,7 @@ clouds:
         imageTag: 9aca808
       imageSync:
         componentSync:
-          imageTag: 0b3c08f
+          imageTag: 8d3c113
         ocMirror:
           imageTag: 0b3c08f
       frontend:

diff --git a/config/config.schema.json b/config/config.schema.json
@@ -239,6 +239,9 @@
               },
               "secrets": {
                 "type": "string"
+              },
+              "pullSecretName": {
+                "type": "string"
               }
             },
             "additionalProperties": false,
@@ -247,7 +250,8 @@
               "imageRepo",
               "imageTag",
               "repositories",
-              "secrets"
+              "secrets",
+              "pullSecretName"
             ]
           },
           "ocMirror": {
@@ -261,13 +265,17 @@
               },
               "imageTag": {
                 "type": "string"
+              },
+              "pullSecretName": {
+                "type": "string"
               }
             },
             "additionalProperties": false,
             "required": [
               "enabled",
               "imageRepo",
-              "imageTag"
+              "imageTag",
+              "pullSecretName"
             ]
           },
           "keyVault": {

diff --git a/config/config.yaml b/config/config.yaml
@@ -84,13 +84,15 @@ defaults:
     componentSync:
       enabled: true
       imageRepo: image-sync/component-sync
-      imageTag: latest
+      imageTag: 8d3c113
       repositories: quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package
       secrets: '[{"registry": "quay.io", "secret": "bearer-secret"}]'
+      pullSecretName: component-sync-pull-secret
     ocMirror:
       enabled: true
       imageRepo: image-sync/oc-mirror
       imageTag: 0b3c08f
+      pullSecretName: pull-secret
     keyVault:
       name: arohcp-imagesync-dev
       private: false

diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
@@ -56,7 +56,8 @@
     "componentSync": {
       "enabled": true,
       "imageRepo": "image-sync/component-sync",
-      "imageTag": "latest",
+      "imageTag": "8d3c113",
+      "pullSecretName": "component-sync-pull-secret",
       "repositories": "quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
       "secrets": "[{\"registry\": \"quay.io\", \"secret\": \"bearer-secret\"}]"
     },
@@ -69,7 +70,8 @@
     "ocMirror": {
       "enabled": true,
       "imageRepo": "image-sync/oc-mirror",
-      "imageTag": "0b3c08f"
+      "imageTag": "0b3c08f",
+      "pullSecretName": "pull-secret"
     },
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },

diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
@@ -56,7 +56,8 @@
     "componentSync": {
       "enabled": true,
       "imageRepo": "image-sync/component-sync",
-      "imageTag": "latest",
+      "imageTag": "8d3c113",
+      "pullSecretName": "component-sync-pull-secret",
       "repositories": "quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
       "secrets": "[{\"registry\": \"quay.io\", \"secret\": \"bearer-secret\"}]"
     },
@@ -69,7 +70,8 @@
     "ocMirror": {
       "enabled": true,
       "imageRepo": "image-sync/oc-mirror",
-      "imageTag": "0b3c08f"
+      "imageTag": "0b3c08f",
+      "pullSecretName": "pull-secret"
     },
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },

diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json
@@ -56,9 +56,10 @@
     "componentSync": {
       "enabled": true,
       "imageRepo": "image-sync/component-sync",
-      "imageTag": "0b3c08f",
-      "repositories": "quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
-      "secrets": ""
+      "imageTag": "8d3c113",
+      "pullSecretName": "component-sync-pull-secret",
+      "repositories": "arohcpsvcdev.azurecr.io/image-sync,arohcpsvcdev.azurecr.io/arohcpfrontend,arohcpsvcdev.azurecr.io/arohcpbackend,quay.io/acm-d/rhtap-hypershift-operator,arohcpsvcdev.azurecr.io/image-sync/oc-mirror,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
+      "secrets": "[{\"registry\": \"quay.io\", \"secret\": \"quay-io-bearer\"},{\"registry\": \"arohcpsvcdev.azurecr.io\", \"secret\": \"arohcpsvcdev-bearer\"}]"
     },
     "environmentName": "global-shared-resources",
     "keyVault": {
@@ -69,7 +70,8 @@
     "ocMirror": {
       "enabled": true,
       "imageRepo": "image-sync/oc-mirror",
-      "imageTag": "0b3c08f"
+      "imageTag": "0b3c08f",
+      "pullSecretName": "ocp-pull-secret"
     },
     "rg": "hcp-underlay-imagesync"
   },

diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json
@@ -56,7 +56,8 @@
     "componentSync": {
       "enabled": true,
       "imageRepo": "image-sync/component-sync",
-      "imageTag": "latest",
+      "imageTag": "8d3c113",
+      "pullSecretName": "component-sync-pull-secret",
       "repositories": "quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
       "secrets": "[{\"registry\": \"quay.io\", \"secret\": \"bearer-secret\"}]"
     },
@@ -69,7 +70,8 @@
     "ocMirror": {
       "enabled": true,
       "imageRepo": "image-sync/oc-mirror",
-      "imageTag": "0b3c08f"
+      "imageTag": "0b3c08f",
+      "pullSecretName": "pull-secret"
     },
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },

diff --git a/dev-infrastructure/configurations/image-sync.tmpl.bicepparam b/dev-infrastructure/configurations/image-sync.tmpl.bicepparam
@@ -7,15 +7,15 @@ param keyVaultName = '{{ .imageSync.keyVault.name}}'
 param keyVaultPrivate = {{ .imageSync.keyVault.private }}
 param keyVaultSoftDelete = {{ .imageSync.keyVault.softDelete }}
 
-param componentSyncPullSecretName = 'component-sync-pull-secret'
+param componentSyncPullSecretName = '{{ .imageSync.componentSync.pullSecretName }}'
 param componentSyncImage = '{{ .svcAcrName }}.azurecr.io/{{ .imageSync.componentSync.imageRepo }}:{{ .imageSync.componentSync.imageTag }}'
 param componentSyncEnabed = {{ .imageSync.componentSync.enabled }}
 param componentSyncSecrets = '{{ .imageSync.componentSync.secrets }}'
 
 param svcAcrName = '{{ .svcAcrName }}'
 
 param ocpAcrName = '{{ .ocpAcrName }}'
-param ocpPullSecretName = 'pull-secret'
+param ocpPullSecretName = '{{ .imageSync.ocMirror.pullSecretName }}
 param repositoriesToSync = '{{ .imageSync.componentSync.repositories }}'
 param ocMirrorImage = '{{ .svcAcrName }}.azurecr.io/{{ .imageSync.ocMirror.imageRepo }}:{{ .imageSync.ocMirror.imageTag }}'
 param ocMirrorEnabled = {{ .imageSync.ocMirror.enabled }}