Update Helm release crossplane to v2

class/defaults.yml

@@ -11,7 +11,7 @@ parameters:
         finalizers:
           - resources-finalizer.argocd.argoproj.io
     charts:
-      crossplane: 1.12.3
+      crossplane: 2.2.0
     images:
       crossplane:
         registry: docker.io

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/clusterrole.yaml

@@ -12,8 +12,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
   name: crossplane
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -26,9 +26,9 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
+    app.kubernetes.io/version: 2.2.0
     crossplane.io/scope: system
-    helm.sh/chart: crossplane-1.12.3
+    helm.sh/chart: crossplane-2.2.0
     rbac.crossplane.io/aggregate-to-crossplane: 'true'
   name: crossplane:system:aggregate-to-crossplane
 rules:
@@ -45,6 +45,7 @@ rules:
       - apiextensions.k8s.io
     resources:
       - customresourcedefinitions
+      - customresourcedefinitions/status
     verbs:
       - '*'
   - apiGroups:
@@ -68,8 +69,9 @@ rules:
       - '*'
   - apiGroups:
       - apiextensions.crossplane.io
+      - ops.crossplane.io
       - pkg.crossplane.io
-      - secrets.crossplane.io
+      - protection.crossplane.io
     resources:
       - '*'
     verbs:

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/clusterrolebinding.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
   name: crossplane
 roleRef:
   apiGroup: rbac.authorization.k8s.io

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/deployment.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
     release: crossplane
   name: crossplane
   namespace: syn-crossplane
@@ -34,8 +34,8 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: crossplane
         app.kubernetes.io/part-of: crossplane
-        app.kubernetes.io/version: 1.12.3
-        helm.sh/chart: crossplane-1.12.3
+        app.kubernetes.io/version: 2.2.0
+        helm.sh/chart: crossplane-2.2.0
         release: crossplane
     spec:
       containers:
@@ -47,34 +47,46 @@ spec:
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane
+                  divisor: '1'
                   resource: limits.cpu
             - name: GOMEMLIMIT
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane
+                  divisor: '1'
                   resource: limits.memory
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: POD_SERVICE_ACCOUNT
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.serviceAccountName
             - name: LEADER_ELECTION
               value: 'true'
-            - name: WEBHOOK_TLS_SECRET_NAME
-              value: webhook-tls-secret
-            - name: WEBHOOK_TLS_CERT_DIR
-              value: /webhook/tls
+            - name: TLS_SERVER_SECRET_NAME
+              value: crossplane-tls-server
+            - name: TLS_SERVER_CERTS_DIR
+              value: /tls/server
+            - name: TLS_CLIENT_SECRET_NAME
+              value: crossplane-tls-client
+            - name: TLS_CLIENT_CERTS_DIR
+              value: /tls/client
           image: docker.io/crossplane/crossplane:v1.12.3
           imagePullPolicy: IfNotPresent
           name: crossplane
           ports:
+            - containerPort: 8081
+              name: readyz
             - containerPort: 8080
               name: metrics
             - containerPort: 9443
               name: webhooks
           resources:
             limits:
               cpu: 1000m
-              memory: 512Mi
+              memory: 1024Mi
             requests:
               cpu: 500m
               memory: 256Mi
@@ -83,26 +95,39 @@ spec:
             readOnlyRootFilesystem: true
             runAsGroup: 65532
             runAsUser: 65532
+          startupProbe:
+            failureThreshold: 30
+            periodSeconds: 2
+            tcpSocket:
+              port: readyz
           volumeMounts:
-            - mountPath: /cache
+            - mountPath: /cache/xpkg
               name: package-cache
-            - mountPath: /webhook/tls
-              name: webhook-tls-secret
+            - mountPath: /cache/xfn
+              name: function-cache
+            - mountPath: /tls/server
+              name: tls-server-certs
+            - mountPath: /tls/client
+              name: tls-client-certs
       hostNetwork: false
       initContainers:
         - args:
             - core
             - init
+            - --activation
+            - '*'
           env:
             - name: GOMAXPROCS
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane-init
+                  divisor: '1'
                   resource: limits.cpu
             - name: GOMEMLIMIT
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane-init
+                  divisor: '1'
                   resource: limits.memory
             - name: POD_NAMESPACE
               valueFrom:
@@ -112,8 +137,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.serviceAccountName
-            - name: WEBHOOK_TLS_SECRET_NAME
-              value: webhook-tls-secret
             - name: WEBHOOK_SERVICE_NAME
               value: crossplane-webhooks
             - name: WEBHOOK_SERVICE_NAMESPACE
@@ -122,13 +145,19 @@ spec:
                   fieldPath: metadata.namespace
             - name: WEBHOOK_SERVICE_PORT
               value: '9443'
+            - name: TLS_CA_SECRET_NAME
+              value: crossplane-root-ca
+            - name: TLS_SERVER_SECRET_NAME
+              value: crossplane-tls-server
+            - name: TLS_CLIENT_SECRET_NAME
+              value: crossplane-tls-client
           image: docker.io/crossplane/crossplane:v1.12.3
           imagePullPolicy: IfNotPresent
           name: crossplane-init
           resources:
             limits:
               cpu: 1000m
-              memory: 512Mi
+              memory: 1024Mi
             requests:
               cpu: 500m
               memory: 256Mi
@@ -137,13 +166,19 @@ spec:
             readOnlyRootFilesystem: true
             runAsGroup: 65532
             runAsUser: 65532
-      securityContext: {}
       serviceAccountName: crossplane
       volumes:
         - emptyDir:
             medium: null
             sizeLimit: 20Mi
           name: package-cache
-        - name: webhook-tls-secret
+        - emptyDir:
+            medium: null
+            sizeLimit: 512Mi
+          name: function-cache
+        - name: tls-server-certs
+          secret:
+            secretName: crossplane-tls-server
+        - name: tls-client-certs
           secret:
-            secretName: webhook-tls-secret
+            secretName: crossplane-tls-client

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/rbac-manager-allowed-provider-permissions.yaml

@@ -12,6 +12,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
   name: crossplane:allowed-provider-permissions

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/rbac-manager-clusterrole.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
   name: crossplane-rbac-manager
 rules:
   - apiGroups:
@@ -25,7 +25,14 @@ rules:
       - ''
     resources:
       - namespaces
-      - serviceaccounts
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
     verbs:
       - get
       - list

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/rbac-manager-clusterrolebinding.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
   name: crossplane-rbac-manager
 roleRef:
   apiGroup: rbac.authorization.k8s.io

tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/rbac-manager-deployment.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.12.3
-    helm.sh/chart: crossplane-1.12.3
+    app.kubernetes.io/version: 2.2.0
+    helm.sh/chart: crossplane-2.2.0
     release: crossplane
   name: crossplane-rbac-manager
   namespace: syn-crossplane
@@ -34,26 +34,27 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: crossplane
         app.kubernetes.io/part-of: crossplane
-        app.kubernetes.io/version: 1.12.3
-        helm.sh/chart: crossplane-1.12.3
+        app.kubernetes.io/version: 2.2.0
+        helm.sh/chart: crossplane-2.2.0
         release: crossplane
     spec:
       containers:
         - args:
             - rbac
             - start
-            - --manage=Basic
             - --provider-clusterrole=crossplane:allowed-provider-permissions
           env:
             - name: GOMAXPROCS
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane
+                  divisor: '1'
                   resource: limits.cpu
             - name: GOMEMLIMIT
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane
+                  divisor: '1'
                   resource: limits.memory
             - name: LEADER_ELECTION
               value: 'true'
@@ -84,11 +85,13 @@ spec:
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane-init
+                  divisor: '1'
                   resource: limits.cpu
             - name: GOMEMLIMIT
               valueFrom:
                 resourceFieldRef:
                   containerName: crossplane-init
+                  divisor: '1'
                   resource: limits.memory
           image: docker.io/crossplane/crossplane:v1.12.3
           imagePullPolicy: IfNotPresent
@@ -105,5 +108,4 @@ spec:
             readOnlyRootFilesystem: true
             runAsGroup: 65532
             runAsUser: 65532
-      securityContext: {}
       serviceAccountName: rbac-manager