Bump app-operator to v7.0.0, chart-operator to v4.0.0 and remove PSP …

…support
giantswarm · Nov 19, 2024 · f37e0e0 · f37e0e0
1 parent 296a0a4
commit f37e0e0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 95 deletions.
diff --git a/helm/cluster-apps-operator/templates/psp.yaml b/helm/cluster-apps-operator/templates/psp.yaml
diff --git a/helm/cluster-apps-operator/templates/rbac.yaml b/helm/cluster-apps-operator/templates/rbac.yaml
@@ -129,36 +129,3 @@ roleRef:
   kind: ClusterRole
   name: {{ include "resource.default.name"  . }}
   apiGroup: rbac.authorization.k8s.io
----
-{{- if not (((.Values.global).podSecurityStandards).enforced) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "resource.psp.name" . }}
-  labels:
-    {{- include "labels.common" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - extensions
-    resources:
-      - podsecuritypolicies
-    verbs:
-      - use
-    resourceNames:
-      - {{ include "resource.psp.name" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "resource.psp.name" . }}
-  labels:
-    {{- include "labels.common" . | nindent 4 }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "resource.default.name"  . }}
-    namespace: {{ include "resource.default.namespace"  . }}
-roleRef:
-  kind: ClusterRole
-  name: {{ include "resource.psp.name" . }}
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}
diff --git a/helm/cluster-apps-operator/values.schema.json b/helm/cluster-apps-operator/values.schema.json
@@ -65,19 +65,6 @@
                 }
             }
         },
-        "global": {
-            "type": "object",
-            "properties": {
-                "podSecurityStandards": {
-                    "type": "object",
-                    "properties": {
-                        "enforced": {
-                            "type": "boolean"
-                        }
-                    }
-                }
-            }
-        },
         "image": {
             "type": "object",
             "properties": {

diff --git a/helm/cluster-apps-operator/values.yaml b/helm/cluster-apps-operator/values.yaml
@@ -2,13 +2,13 @@ appOperator:
   catalog: control-plane-catalog
   # used by renovate
   # repo: giantswarm/app-operator
-  version: 6.11.0
+  version: 7.0.0
 
 chartOperator:
   catalog: default
   # used by renovate
   # repo: giantswarm/chart-operator
-  version: 3.3.0
+  version: 4.0.0
 
 baseDomain: ""
 
@@ -84,7 +84,3 @@ serviceMonitor:
   interval: "60s"
   # -- (duration) Prometheus scrape timeout.
   scrapeTimeout: "45s"
-
-global:
-  podSecurityStandards:
-    enforced: false
diff --git a/service/controller/resource/clustersecret/vsphere_test.go b/service/controller/resource/clustersecret/vsphere_test.go
@@ -100,8 +100,6 @@ func getValuesProxyEnabled() string {
     global:
       release:
         version: 1.2.3
-      podSecurityStandards:
-        enforced: true
       connectivity:
         baseDomain: test.example.io
         proxy:
@@ -119,8 +117,6 @@ func getValuesProxyDisabled() string {
     global:
       release:
         version: 1.2.3
-      podSecurityStandards:
-        enforced: true
       connectivity:
         baseDomain: test.example.io
         proxy:
@@ -135,8 +131,6 @@ func getValuesProxyNotDefined() string {
     global:
       release:
         version: 1.2.3
-      podSecurityStandards:
-        enforced: true
       connectivity:
         baseDomain: test.example.io
         availabilityZoneUsageLimit: 3
@@ -149,8 +143,6 @@ func getValuesProxyEmpty() string {
     global:
       release:
         version: 1.2.3
-      podSecurityStandards:
-        enforced: true
       connectivity:
         baseDomain: test.example.io
         proxy: