Update sriov images and chart

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/1864/head
Manuel Buil 2022-04-19 17:45:20 +02:00
parent 9ea91f74f5
commit ae7b228b5f
3 changed files with 21 additions and 20 deletions

View File

@ -23,7 +23,7 @@
labels: labels:
{{- include "sriov-network-operator.labels" . | nindent 4 }} {{- include "sriov-network-operator.labels" . | nindent 4 }}
spec: spec:
@@ -14,18 +29,18 @@ @@ -18,19 +33,19 @@
labels: labels:
name: sriov-network-operator name: sriov-network-operator
spec: spec:
@ -44,6 +44,7 @@
+{{ toYaml .Values.operator.tolerations | indent 8 }} +{{ toYaml .Values.operator.tolerations | indent 8 }}
+{{- end }} +{{- end }}
serviceAccountName: {{ include "sriov-network-operator.fullname" . }} serviceAccountName: {{ include "sriov-network-operator.fullname" . }}
priorityClassName: "system-node-critical"
containers: containers:
- name: {{ include "sriov-network-operator.fullname" . }} - name: {{ include "sriov-network-operator.fullname" . }}
- image: {{ .Values.images.operator }} - image: {{ .Values.images.operator }}
@ -51,7 +52,7 @@
command: command:
- sriov-network-operator - sriov-network-operator
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@@ -35,19 +50,19 @@ @@ -44,19 +59,19 @@
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SRIOV_CNI_IMAGE - name: SRIOV_CNI_IMAGE
@ -77,10 +78,10 @@
- name: RESOURCE_PREFIX - name: RESOURCE_PREFIX
value: {{ .Values.operator.resourcePrefix }} value: {{ .Values.operator.resourcePrefix }}
- name: ENABLE_ADMISSION_CONTROLLER - name: ENABLE_ADMISSION_CONTROLLER
@@ -64,3 +79,9 @@ @@ -75,3 +90,9 @@
value: {{ .Release.AppVersion }}
- name: SRIOV_CNI_BIN_PATH
value: {{ .Values.operator.cniBinPath }} value: {{ .Values.operator.cniBinPath }}
- name: CLUSTER_TYPE
value: {{ .Values.operator.clusterType }}
+ {{- if .Values.operator.enableAdmissionController }} + {{- if .Values.operator.enableAdmissionController }}
+ {{- if not .Values.cert_manager }} + {{- if not .Values.cert_manager }}
+ - name: WEBHOOK_CA_BUNDLE + - name: WEBHOOK_CA_BUNDLE

View File

@ -25,34 +25,34 @@
# Image URIs for sriov-network-operator components # Image URIs for sriov-network-operator components
images: images:
- operator: quay.io/openshift/origin-sriov-network-operator - operator: ghcr.io/k8snetworkplumbingwg/sriov-network-operator
- sriovConfigDaemon: quay.io/openshift/origin-sriov-network-config-daemon - sriovConfigDaemon: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-config-daemon
- sriovCni: quay.io/openshift/origin-sriov-cni - sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni
- ibSriovCni: quay.io/openshift/origin-sriov-infiniband-cni - ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni
- sriovDevicePlugin: quay.io/openshift/origin-sriov-network-device-plugin - sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin
- resourcesInjector: quay.io/openshift/origin-sriov-dp-admission-controller - resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector
- webhook: quay.io/openshift/origin-sriov-network-webhook - webhook: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-webhook
+ operator: + operator:
+ image: rancher/hardened-sriov-network-operator + image: rancher/hardened-sriov-network-operator
+ tag: v1.0.0-build20210429 + tag: v1.1.0-build20220419
+ sriovConfigDaemon: + sriovConfigDaemon:
+ image: rancher/hardened-sriov-network-config-daemon + image: rancher/hardened-sriov-network-config-daemon
+ tag: v1.0.0-build20210429 + tag: v1.1.0-build20220419
+ sriovCni: + sriovCni:
+ image: rancher/hardened-sriov-cni + image: rancher/hardened-sriov-cni
+ tag: v2.6-build20210310 + tag: v2.6.2-build20220419
+ ibSriovCni: + ibSriovCni:
+ image: rancher/hardened-ib-sriov-cni + image: rancher/hardened-ib-sriov-cni
+ tag: v1.0.0-build20210310 + tag: v1.0.2-build20220419
+ sriovDevicePlugin: + sriovDevicePlugin:
+ image: rancher/hardened-sriov-network-device-plugin + image: rancher/hardened-sriov-network-device-plugin
+ tag: v3.3.1-build20210310 + tag: v3.4.0-build20220419
+ resourcesInjector: + resourcesInjector:
+ image: rancher/hardened-sriov-network-resources-injector + image: rancher/hardened-sriov-network-resources-injector
+ tag: v1-build20210310 + tag: v1.3-build20220419
+ webhook: + webhook:
+ image: rancher/hardened-sriov-network-webhook + image: rancher/hardened-sriov-network-webhook
+ tag: v1.0.0-build20210429 + tag: v1.1.0-build20220419
+ +
+# cert_manager enables integration with cert-manager to generate +# cert_manager enables integration with cert-manager to generate
+# certificates for the operator webhooks. Otherwise the chart will +# certificates for the operator webhooks. Otherwise the chart will

View File

@ -1,6 +1,6 @@
url: https://github.com/k8snetworkplumbingwg/sriov-network-operator.git url: https://github.com/k8snetworkplumbingwg/sriov-network-operator.git
subdirectory: deployment/sriov-network-operator subdirectory: deployment/sriov-network-operator
commit: c5c943cc214f4113b6f6be8d7c48ac837aa1669c commit: 47ede47f64c4d881d744192bef8e26be68578c40 # the commit points to the tag v1.1.0
version: 100.0.3 version: 100.0.3
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd