Manual bundle-to-charts update for main branch (stolostron#1044)

Signed-off-by: Joe Gdaniec <[email protected]>
eemurphy · May 31, 2023 · ae37f1a · ae37f1a
1 parent b2fb846
commit ae37f1a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/pkg/rendering/renderer_test.go b/pkg/rendering/renderer_test.go
@@ -91,6 +91,7 @@ func TestRender(t *testing.T) {
 	os.Setenv("HTTPS_PROXY", "test2")
 	os.Setenv("NO_PROXY", "test3")
 	os.Setenv("DIRECTORY_OVERRIDE", "../templates")
+	os.Setenv("ACM_HUB_OCP_VERSION", "4.10.0")
 
 	testImages := map[string]string{}
 	for _, v := range utils.GetTestImages() {
@@ -245,6 +246,7 @@ func TestRender(t *testing.T) {
 	os.Unsetenv("NO_PROXY")
 	os.Unsetenv("POD_NAMESPACE")
 	os.Unsetenv("DIRECTORY_OVERRIDE")
+	os.Unsetenv("ACM_HUB_OCP_VERSION")
 
 }
 

diff --git a/.../charts/toggle/multicloud-operators-subscription/templates/multicluster-integrations.yaml b/.../charts/toggle/multicloud-operators-subscription/templates/multicluster-integrations.yaml
@@ -214,6 +214,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
+        seccompProfile:
+          type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-applications
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/...oggle/multicloud-operators-subscription/templates/multicluster-operators-application.yaml b/...oggle/multicloud-operators-subscription/templates/multicluster-operators-application.yaml
@@ -232,6 +232,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
+        seccompProfile:
+          type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-applications
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/...ts/toggle/multicloud-operators-subscription/templates/multicluster-operators-channel.yaml b/...ts/toggle/multicloud-operators-subscription/templates/multicluster-operators-channel.yaml
@@ -112,8 +112,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
         seccompProfile:
           type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-operators
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/.../multicloud-operators-subscription/templates/multicluster-operators-hub-subscription.yaml b/.../multicloud-operators-subscription/templates/multicluster-operators-hub-subscription.yaml
@@ -114,8 +114,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
         seccompProfile:
           type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-operators
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/...loud-operators-subscription/templates/multicluster-operators-standalone-subscription.yaml b/...loud-operators-subscription/templates/multicluster-operators-standalone-subscription.yaml
@@ -113,8 +113,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
         seccompProfile:
           type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-operators
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/...lticloud-operators-subscription/templates/multicluster-operators-subscription-report.yaml b/...lticloud-operators-subscription/templates/multicluster-operators-subscription-report.yaml
@@ -108,6 +108,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
+        seccompProfile:
+          type: RuntimeDefault
+{{- end }}
       serviceAccountName: multicluster-applications
 {{- with .Values.hubconfig.tolerations }}
       tolerations:

diff --git a/...tes/charts/toggle/search-v2-operator/templates/search-v2-operator-controller-manager.yaml b/...tes/charts/toggle/search-v2-operator/templates/search-v2-operator-controller-manager.yaml
@@ -140,6 +140,10 @@ spec:
 {{- end }}
       securityContext:
         runAsNonRoot: true
+{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
+        seccompProfile:
+          type: RuntimeDefault
+{{- end }}
       serviceAccountName: search-v2-operator
       terminationGracePeriodSeconds: 10
 {{- with .Values.hubconfig.tolerations }}