From ae7b228b5f101245db817c33a00511dda9e30c93 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Tue, 19 Apr 2022 17:45:20 +0200
Subject: [PATCH] Update sriov images and chart

Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 .../patch/templates/operator.yaml.patch       | 11 ++++----
 .../generated-changes/patch/values.yaml.patch | 28 +++++++++----------
 packages/rancher-sriov/package.yaml           |  2 +-
 3 files changed, 21 insertions(+), 20 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
index 28ca6fdb0..f72ce9b53 100644
--- a/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch
+++ b/packages/rancher-sriov/generated-changes/patch/templates/operator.yaml.patch
@@ -23,7 +23,7 @@
    labels:
    {{- include "sriov-network-operator.labels" . | nindent 4 }}
  spec:
-@@ -14,18 +29,18 @@
+@@ -18,19 +33,19 @@
        labels:
          name: sriov-network-operator
      spec:
@@ -44,6 +44,7 @@
 +{{ toYaml .Values.operator.tolerations | indent 8 }}
 +{{- end }}
        serviceAccountName: {{ include "sriov-network-operator.fullname" . }}
+       priorityClassName: "system-node-critical"
        containers:
          - name: {{ include "sriov-network-operator.fullname" . }}
 -          image: {{ .Values.images.operator }}
@@ -51,7 +52,7 @@
            command:
              - sriov-network-operator
            imagePullPolicy: IfNotPresent
-@@ -35,19 +50,19 @@
+@@ -44,19 +59,19 @@
                  fieldRef:
                    fieldPath: metadata.namespace
              - name: SRIOV_CNI_IMAGE
@@ -77,10 +78,10 @@
              - name: RESOURCE_PREFIX
                value: {{ .Values.operator.resourcePrefix }}
              - name: ENABLE_ADMISSION_CONTROLLER
-@@ -64,3 +79,9 @@
-               value: {{ .Release.AppVersion }}
-             - name: SRIOV_CNI_BIN_PATH
+@@ -75,3 +90,9 @@
                value: {{ .Values.operator.cniBinPath }}
+             - name: CLUSTER_TYPE
+               value: {{ .Values.operator.clusterType }}
 +            {{- if .Values.operator.enableAdmissionController }}
 +            {{- if not .Values.cert_manager }}
 +            - name: WEBHOOK_CA_BUNDLE
diff --git a/packages/rancher-sriov/generated-changes/patch/values.yaml.patch b/packages/rancher-sriov/generated-changes/patch/values.yaml.patch
index 2919a8be3..17849a3c2 100644
--- a/packages/rancher-sriov/generated-changes/patch/values.yaml.patch
+++ b/packages/rancher-sriov/generated-changes/patch/values.yaml.patch
@@ -25,34 +25,34 @@
  
  # Image URIs for sriov-network-operator components
  images:
--  operator: quay.io/openshift/origin-sriov-network-operator
--  sriovConfigDaemon: quay.io/openshift/origin-sriov-network-config-daemon
--  sriovCni: quay.io/openshift/origin-sriov-cni
--  ibSriovCni: quay.io/openshift/origin-sriov-infiniband-cni
--  sriovDevicePlugin: quay.io/openshift/origin-sriov-network-device-plugin
--  resourcesInjector: quay.io/openshift/origin-sriov-dp-admission-controller
--  webhook: quay.io/openshift/origin-sriov-network-webhook
+-  operator: ghcr.io/k8snetworkplumbingwg/sriov-network-operator
+-  sriovConfigDaemon: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-config-daemon
+-  sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni
+-  ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni
+-  sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin
+-  resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector
+-  webhook: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-webhook
 +  operator:
 +    image: rancher/hardened-sriov-network-operator
-+    tag: v1.0.0-build20210429
++    tag: v1.1.0-build20220419
 +  sriovConfigDaemon:
 +    image: rancher/hardened-sriov-network-config-daemon
-+    tag: v1.0.0-build20210429
++    tag: v1.1.0-build20220419
 +  sriovCni:
 +    image: rancher/hardened-sriov-cni
-+    tag: v2.6-build20210310
++    tag: v2.6.2-build20220419
 +  ibSriovCni: 
 +    image: rancher/hardened-ib-sriov-cni
-+    tag: v1.0.0-build20210310
++    tag: v1.0.2-build20220419
 +  sriovDevicePlugin: 
 +    image: rancher/hardened-sriov-network-device-plugin
-+    tag: v3.3.1-build20210310
++    tag: v3.4.0-build20220419
 +  resourcesInjector: 
 +    image: rancher/hardened-sriov-network-resources-injector
-+    tag: v1-build20210310
++    tag: v1.3-build20220419
 +  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
 +# certificates for the operator webhooks. Otherwise the chart will
diff --git a/packages/rancher-sriov/package.yaml b/packages/rancher-sriov/package.yaml
index 7e009fb98..8cc839577 100644
--- a/packages/rancher-sriov/package.yaml
+++ b/packages/rancher-sriov/package.yaml
@@ -1,6 +1,6 @@
 url: https://github.com/k8snetworkplumbingwg/sriov-network-operator.git
 subdirectory: deployment/sriov-network-operator
-commit: c5c943cc214f4113b6f6be8d7c48ac837aa1669c
+commit: 47ede47f64c4d881d744192bef8e26be68578c40 # the commit points to the tag v1.1.0
 version: 100.0.3
 additionalCharts:
   - workingDir: charts-crd