Merge pull request #649 from vshn/crossplane-1-18

Bump crossplane to 1.18

Author: zugao

class/defaults.yml

@@ -6,7 +6,7 @@ parameters:
     charts:
       crossplane:
         source: https://charts.crossplane.io/stable
-        version: 1.17.0
+        version: 1.18.3
       redis:
         source: https://charts.bitnami.com/bitnami
         version: 17.7.1
@@ -81,7 +81,7 @@ parameters:
       crossplane:
         registry: docker.io
         image: crossplane/crossplane
-        tag: v1.17.5
+        tag: v1.18.3
         pullPolicy: IfNotPresent
       kubectl:
         registry: docker.io
@@ -134,12 +134,6 @@ parameters:
         prometheus_rule_labels:
           prometheus: platform
         instance: null
-      providers: {}
-      serviceAccounts: {}
-      clusterRoles: {}
-      clusterRoleBindings: {}
-      controllerConfigs: {}
-      providerConfigs: {}
       helmValues:
         xfn:
           enabled: true

component/crossplane.jsonnet

@@ -7,74 +7,6 @@ local prometheus = import 'lib/prometheus.libsonnet';
 local inv = kap.inventory();
 
 local params = inv.parameters.appcat.crossplane;
-local on_openshift4 = std.member([ 'openshift4', 'oke' ], inv.parameters.facts.distribution);
-local has_service_account(provider) = std.count(std.objectFields(params.serviceAccounts), provider) > 0;
-local has_any_service = std.length(std.filter(function(x) std.objectHas(params.serviceAccounts, x), std.objectFields(params.providers))) > 0;
-local missing_controller(provider_name) = !std.objectHas(params.controllerConfigs, provider_name);
-
-local controller_config_ref(controller_config_name) = {
-  controllerConfigRef: {
-    name: controller_config_name,
-  },
-};
-
-local merge_config_for_openshift =
-  (if on_openshift4 then {
-     spec+: {
-       podSecurityContext: {},
-       securityContext: {},
-     },
-   }
-   else {});
-
-local merge_service_account_from_resource(name) =
-  if has_service_account(name) then {
-    spec+: {
-      serviceAccountName: name,
-    },
-  }
-  else {};
-
-local service_accounts = com.generateResources(params.serviceAccounts, kube.ServiceAccount);
-local cluster_roles = com.generateResources(params.clusterRoles, kube.ClusterRole);
-local cluster_role_bindings = com.generateResources(params.clusterRoleBindings, kube.ClusterRoleBinding);
-
-local provider_configs = [
-  // apiVersion is a required field for each ProviderConfig
-  assert provider_config.apiVersion != '' : 'apiVersion is mandatory in ProviderConfig ' + provider_config.metadata.name;
-  provider_config
-  for provider_config in com.generateResources(params.providerConfigs, crossplane.ProviderConfig)
-];
-
-local controller_configs =
-  /* ControllerConfig resources generated from params.controllerConfigs adjusted by facts.distribution and
-   params.serviceAccounts
-   In case params.serviceAccount.name is different from a matched controller's serviceAccountName then
-   params.serviceAccount.name takes precedence
-   */
-  [
-    com.makeMergeable(controller_config) +
-    merge_config_for_openshift +
-    merge_service_account_from_resource(controller_config.metadata.name)
-    for controller_config in com.generateResources(params.controllerConfigs, crossplane.ControllerConfig)
-  ] +
-  // Non defined ControllerConfig resources generated based on facts.distribution and params.serviceAccounts when
-  // params.providers are being used
-  [
-    crossplane.ControllerConfig(provider) +
-    merge_config_for_openshift +
-    merge_service_account_from_resource(provider)
-    for provider in std.objectFields(params.providers)
-    if missing_controller(provider) && (on_openshift4 || has_any_service)
-  ];
-
-local providers = [
-  crossplane.Provider(provider) {
-    spec+: params.providers[provider] +
-           if on_openshift4 || has_service_account(provider) then controller_config_ref(provider) else {},
-  }
-  for provider in std.objectFields(params.providers)
-];
 
 local rbacFinalizerRole = kube.ClusterRole('crossplane-rbac-manager:finalizer') {
   rules+: [
@@ -190,11 +122,5 @@ if vars.isSingleOrControlPlaneCluster then
     },
     '01_rbac_finalizer_clusterrole': rbacFinalizerRole,
     '01_rbac_finalizer_clusterrolebinding': rbacFinalizerRoleBinding,
-    [if std.length(providers) > 0 then '10_providers']: providers,
     [if params.monitoring.enabled then '20_monitoring']: monitoring,
-    [if std.length(controller_configs) > 0 then '30_controller_configs']: controller_configs,
-    [if std.length(service_accounts) > 0 then '40_service_accounts']: service_accounts,
-    [if std.length(cluster_roles) > 0 then '50_cluster_roles']: cluster_roles,
-    [if std.length(cluster_role_bindings) > 0 then '60_cluster_role_bindings']: cluster_role_bindings,
-    [if std.length(provider_configs) > 0 then '70_provider_configs']: provider_configs,
   } else {}

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/clusterrole.yaml

@@ -14,8 +14,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -30,9 +30,9 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
+    app.kubernetes.io/version: 1.18.3
     crossplane.io/scope: system
-    helm.sh/chart: crossplane-1.17.0
+    helm.sh/chart: crossplane-1.18.3
     rbac.crossplane.io/aggregate-to-crossplane: 'true'
   name: crossplane:system:aggregate-to-crossplane
 rules:

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/clusterrolebinding.yaml

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

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml

@@ -10,8 +10,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     release: appcat
   name: crossplane
   namespace: syn-crossplane
@@ -32,8 +32,8 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: crossplane
         app.kubernetes.io/part-of: crossplane
-        app.kubernetes.io/version: 1.17.0
-        helm.sh/chart: crossplane-1.17.0
+        app.kubernetes.io/version: 1.18.3
+        helm.sh/chart: crossplane-1.18.3
         release: appcat
     spec:
       containers:
@@ -72,7 +72,7 @@ spec:
               value: crossplane-tls-client
             - name: TLS_CLIENT_CERTS_DIR
               value: /tls/client
-          image: docker.io/crossplane/crossplane:v1.17.5
+          image: docker.io/crossplane/crossplane:v1.18.3
           imagePullPolicy: IfNotPresent
           name: crossplane
           ports:
@@ -144,7 +144,7 @@ spec:
               value: crossplane-tls-server
             - name: TLS_CLIENT_SECRET_NAME
               value: crossplane-tls-client
-          image: docker.io/crossplane/crossplane:v1.17.5
+          image: docker.io/crossplane/crossplane:v1.18.3
           imagePullPolicy: IfNotPresent
           name: crossplane-init
           resources:

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-allowed-provider-permissions.yaml

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

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-clusterrole.yaml

@@ -10,8 +10,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-rbac-manager
 rules:
   - apiGroups:

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-clusterrolebinding.yaml

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

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml

@@ -10,8 +10,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     release: appcat
   name: crossplane-rbac-manager
   namespace: syn-crossplane
@@ -32,8 +32,8 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: crossplane
         app.kubernetes.io/part-of: crossplane
-        app.kubernetes.io/version: 1.17.0
-        helm.sh/chart: crossplane-1.17.0
+        app.kubernetes.io/version: 1.18.3
+        helm.sh/chart: crossplane-1.18.3
         release: appcat
     spec:
       containers:
@@ -56,7 +56,7 @@ spec:
                   resource: limits.memory
             - name: LEADER_ELECTION
               value: 'true'
-          image: docker.io/crossplane/crossplane:v1.17.5
+          image: docker.io/crossplane/crossplane:v1.18.3
           imagePullPolicy: IfNotPresent
           name: crossplane
           resources:
@@ -88,7 +88,7 @@ spec:
                   containerName: crossplane-init
                   divisor: '1'
                   resource: limits.memory
-          image: docker.io/crossplane/crossplane:v1.17.5
+          image: docker.io/crossplane/crossplane:v1.18.3
           imagePullPolicy: IfNotPresent
           name: crossplane-init
           resources:

tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-managed-clusterroles.yaml

@@ -14,8 +14,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-admin
 ---
 aggregationRule:
@@ -34,8 +34,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-edit
 ---
 aggregationRule:
@@ -54,8 +54,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-view
 ---
 aggregationRule:
@@ -74,8 +74,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-browse
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -90,8 +90,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     rbac.crossplane.io/aggregate-to-admin: 'true'
   name: crossplane:aggregate-to-admin
 rules:
@@ -165,8 +165,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     rbac.crossplane.io/aggregate-to-edit: 'true'
   name: crossplane:aggregate-to-edit
 rules:
@@ -223,8 +223,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     rbac.crossplane.io/aggregate-to-view: 'true'
   name: crossplane:aggregate-to-view
 rules:
@@ -281,8 +281,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
     rbac.crossplane.io/aggregate-to-browse: 'true'
   name: crossplane:aggregate-to-browse
 rules:
@@ -315,8 +315,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: crossplane
     app.kubernetes.io/part-of: crossplane
-    app.kubernetes.io/version: 1.17.0
-    helm.sh/chart: crossplane-1.17.0
+    app.kubernetes.io/version: 1.18.3
+    helm.sh/chart: crossplane-1.18.3
   name: crossplane-admin
 roleRef:
   apiGroup: rbac.authorization.k8s.io