diff --git a/assets/sriov/sriov-103.0.0+up0.1.0.tgz b/assets/sriov/sriov-103.0.0+up0.1.0.tgz index aadbd9b447..d1b1385316 100644 Binary files a/assets/sriov/sriov-103.0.0+up0.1.0.tgz and b/assets/sriov/sriov-103.0.0+up0.1.0.tgz differ diff --git a/assets/ui-plugin-operator/ui-plugin-operator-103.0.1+up0.2.1.tgz b/assets/ui-plugin-operator/ui-plugin-operator-103.0.1+up0.2.1.tgz index d68ef7240f..1a36472505 100644 Binary files a/assets/ui-plugin-operator/ui-plugin-operator-103.0.1+up0.2.1.tgz and b/assets/ui-plugin-operator/ui-plugin-operator-103.0.1+up0.2.1.tgz differ diff --git a/charts/sriov/103.0.0+up0.1.0/templates/operator.yaml b/charts/sriov/103.0.0+up0.1.0/templates/operator.yaml index ac3cb4c345..0d39480e10 100644 --- a/charts/sriov/103.0.0+up0.1.0/templates/operator.yaml +++ b/charts/sriov/103.0.0+up0.1.0/templates/operator.yaml @@ -45,7 +45,7 @@ spec: priorityClassName: "system-node-critical" containers: - name: {{ include "sriov-network-operator.fullname" . }} - 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 @@ -59,19 +59,19 @@ spec: fieldRef: fieldPath: metadata.namespace - name: SRIOV_CNI_IMAGE - 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: {{ 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: {{ 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: {{ 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: {{ 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: {{ 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/charts/ui-plugin-operator/103.0.1+up0.2.1/templates/deployment.yaml b/charts/ui-plugin-operator/103.0.1+up0.2.1/templates/deployment.yaml index b355b40ff6..7cf9e5dc7e 100644 --- a/charts/ui-plugin-operator/103.0.1+up0.2.1/templates/deployment.yaml +++ b/charts/ui-plugin-operator/103.0.1+up0.2.1/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http diff --git a/index.yaml b/index.yaml index f31135fbbd..02b42d2522 100755 --- a/index.yaml +++ b/index.yaml @@ -17353,10 +17353,10 @@ entries: catalog.cattle.io/upstream-version: 1.2.0 apiVersion: v2 appVersion: 1.2.0 - created: "2023-09-26T17:13:13.630583533-06:00" + created: "2023-09-26T17:49:37.736425794-06:00" description: SR-IOV network operator configures and manages SR-IOV networks in the kubernetes cluster - digest: 2c7728a1571b3487d8d8facae1545dee2155de2fcb639a5b16a976840ca935aa + digest: 1a92ec793b0af6b747de0fba82221c5dad5d91dbf4c0571e396d32c12802c989 home: https://github.com/k8snetworkplumbingwg/sriov-network-operator icon: https://charts.rancher.io/assets/logos/sr-iov.svg keywords: @@ -18012,9 +18012,9 @@ entries: catalog.cattle.io/release-name: ui-plugin-operator apiVersion: v1 appVersion: 0.1.1 - created: "2023-08-23T21:53:32.665248158-03:00" + created: "2023-09-06T19:29:31.059049134-03:00" description: A UI Plugin Operator Chart for plugin management in Rancher - digest: 39b9ab5d48369ca88867b6d3d03e566f1eb34749ccfb3cbc5f56b482ffb3ad8b + digest: cf653ce6147f12591982a4f547874ccd191a4d7805531501f86f5317c3ddd547 keywords: - applications - infrastructure diff --git a/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch b/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch index db3834e6bd..d47ec370db 100644 --- 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/ui-plugin-operator/generated-changes/patch/templates/deployment.yaml.patch b/packages/ui-plugin-operator/generated-changes/patch/templates/deployment.yaml.patch new file mode 100644 index 0000000000..a68c5606a2 --- /dev/null +++ b/packages/ui-plugin-operator/generated-changes/patch/templates/deployment.yaml.patch @@ -0,0 +1,11 @@ +--- charts-original/templates/deployment.yaml ++++ charts/templates/deployment.yaml +@@ -37,7 +37,7 @@ + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} +- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" ++ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http diff --git a/release.yaml b/release.yaml index c201b1de5a..636ec31915 100644 --- a/release.yaml +++ b/release.yaml @@ -1,8 +1,8 @@ -rancher-monitoring: - - 103.0.0+up45.31.1 -rancher-monitoring-crd: - - 103.0.0+up45.31.1 -prometheus-federator: - - 103.0.0+up0.4.0 -rancher-pushprox: - - 103.0.0 +sriov: + - 103.0.0+up0.1.0 +sriov-crd: + - 103.0.0+up0.1.0 +ui-plugin-operator: + - 103.0.1+up0.2.1 +ui-plugin-operator-crd: + - 103.0.1+up0.2.1