Add repository annotation

Use the `repository` annotation instead of `images` to support chart deployment in an air-gap environment Signed-off-by: Michael Fritch <mfritch@suse.com>
rancher · Feb 8, 2024 · a421d9e · a421d9e
1 parent c856e58
commit a421d9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch b/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch
@@ -52,7 +52,7 @@
        containers:
          - name: {{ include "sriov-network-operator.fullname" . }}
 -          image: {{ .Values.images.operator }}
-+          image: {{ include "system_default_registry" . }}{{ .Values.images.operator.image }}:{{ .Values.images.operator.tag }}
++          image: {{ include "system_default_registry" . }}{{ .Values.images.operator.repository }}:{{ .Values.images.operator.tag }}
            command:
              - sriov-network-operator
            imagePullPolicy: IfNotPresent
@@ -61,24 +61,24 @@
                    fieldPath: metadata.namespace
              - name: SRIOV_CNI_IMAGE
 -              value: {{ .Values.images.sriovCni }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovCni.image }}:{{ .Values.images.sriovCni.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovCni.repository }}:{{ .Values.images.sriovCni.tag }}
              - name: SRIOV_INFINIBAND_CNI_IMAGE
 -              value: {{ .Values.images.ibSriovCni }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.ibSriovCni.image }}:{{ .Values.images.ibSriovCni.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.ibSriovCni.repository }}:{{ .Values.images.ibSriovCni.tag }}
              - name: SRIOV_DEVICE_PLUGIN_IMAGE
 -              value: {{ .Values.images.sriovDevicePlugin }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovDevicePlugin.image }}:{{ .Values.images.sriovDevicePlugin.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovDevicePlugin.repository }}:{{ .Values.images.sriovDevicePlugin.tag }}
              - name: NETWORK_RESOURCES_INJECTOR_IMAGE
 -              value: {{ .Values.images.resourcesInjector }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.resourcesInjector.image }}:{{ .Values.images.resourcesInjector.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.resourcesInjector.repository }}:{{ .Values.images.resourcesInjector.tag }}
              - name: OPERATOR_NAME
                value: sriov-network-operator
              - name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
 -              value: {{ .Values.images.sriovConfigDaemon }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovConfigDaemon.image }}:{{ .Values.images.sriovConfigDaemon.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.sriovConfigDaemon.repository }}:{{ .Values.images.sriovConfigDaemon.tag }}
              - name: SRIOV_NETWORK_WEBHOOK_IMAGE
 -              value: {{ .Values.images.webhook }}
-+              value: {{ include "system_default_registry" . }}{{ .Values.images.webhook.image }}:{{ .Values.images.webhook.tag }}
++              value: {{ include "system_default_registry" . }}{{ .Values.images.webhook.repository }}:{{ .Values.images.webhook.tag }}
              - name: RESOURCE_PREFIX
                value: {{ .Values.operator.resourcePrefix }}
              - name: ENABLE_ADMISSION_CONTROLLER

diff --git a/packages/rancher-sriov/generated-changes/patch/values.yaml.patch b/packages/rancher-sriov/generated-changes/patch/values.yaml.patch
@@ -35,25 +35,25 @@
 -  resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector
 -  webhook: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-webhook
 +  operator:
-+    image: rancher/hardened-sriov-network-operator
++    repository: rancher/hardened-sriov-network-operator
 +    tag: v1.2.0-build20221014
 +  sriovConfigDaemon:
-+    image: rancher/hardened-sriov-network-config-daemon
++    repository: rancher/hardened-sriov-network-config-daemon
 +    tag: v1.2.0-build20221014
 +  sriovCni:
-+    image: rancher/hardened-sriov-cni
++    repository: rancher/hardened-sriov-cni
 +    tag: v2.6.3-build20221014
 +  ibSriovCni: 
-+    image: rancher/hardened-ib-sriov-cni
++    repository: rancher/hardened-ib-sriov-cni
 +    tag: v1.0.2-build20221014
 +  sriovDevicePlugin: 
-+    image: rancher/hardened-sriov-network-device-plugin
++    repository: rancher/hardened-sriov-network-device-plugin
 +    tag: v3.5.1-build20221014
 +  resourcesInjector: 
-+    image: rancher/hardened-sriov-network-resources-injector
++    repository: rancher/hardened-sriov-network-resources-injector
 +    tag: v1.5-build20221014
 +  webhook:
-+    image: rancher/hardened-sriov-network-webhook
++    repository: rancher/hardened-sriov-network-webhook
 +    tag: v1.2.0-build20221014
 +
 +# cert_manager enables integration with cert-manager to generate