From c973186ef5e5966e60e6bdd40532da5edd2159af Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Tue, 28 Nov 2023 13:44:04 +0100 Subject: [PATCH] Migrate providers to DeploymentRuntimeConfigs This also re-adds the syn managed service accounts. This is to ensure that crossplane doesn't manage the service accounts anymore. As that will lead to a reconcile loop on openshift. --- component/class/defaults.yml | 13 +-- component/component/common.libsonnet | 30 +++++++ component/component/functions.jsonnet | 60 +++++-------- component/component/provider.jsonnet | 84 +++++++++---------- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + ... => 10_runtimeconfig_function_appcat.yaml} | 3 +- .../10_runtimeconfig_function_pnt.yaml} | 3 +- .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../appcat/appcat/10_provider_cloudscale.yaml | 18 ++++ .../appcat/appcat/10_provider_kubernetes.yaml | 35 +++++--- .../10_runtimeconfig_function_appcat.yaml} | 3 +- .../10_runtimeconfig_function_pnt.yaml} | 3 +- .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../10_runtimeconfig_function_appcat.yaml} | 3 +- .../10_runtimeconfig_function_pnt.yaml} | 3 +- .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + ... => 10_runtimeconfig_function_appcat.yaml} | 3 +- .../10_runtimeconfig_function_pnt.yaml} | 3 +- .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../appcat/appcat/10_provider_exoscale.yaml | 18 ++++ .../appcat/appcat/10_provider_kubernetes.yaml | 35 +++++--- .../appcat/10_runtimeconfig_appcat.yaml | 18 ---- .../appcat/10_runtimeconfig_default.yaml | 14 ---- .../10_runtimeconfig_function_appcat.yaml | 19 +++++ .../appcat/10_runtimeconfig_function_pnt.yaml | 15 ++++ .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../minio/appcat/appcat/10_provider_helm.yaml | 35 +++++--- .../appcat/appcat/10_provider_kubernetes.yaml | 35 +++++--- .../appcat/10_runtimeconfig_appcat.yaml | 18 ---- .../appcat/10_runtimeconfig_default.yaml | 14 ---- .../10_runtimeconfig_function_appcat.yaml | 19 +++++ .../appcat/10_runtimeconfig_function_pnt.yaml | 15 ++++ .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../appcat/appcat/10_provider_cloudscale.yaml | 27 +++--- .../appcat/appcat/10_provider_exoscale.yaml | 27 +++--- .../appcat/appcat/10_provider_kubernetes.yaml | 37 +++++--- .../appcat/10_runtimeconfig_appcat.yaml | 18 ---- .../appcat/10_runtimeconfig_default.yaml | 14 ---- .../10_runtimeconfig_function_appcat.yaml | 19 +++++ .../appcat/10_runtimeconfig_function_pnt.yaml | 15 ++++ .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ .../appcat/appcat/10_function_appcat.yaml | 2 +- .../10_function_patch_and_transform.yaml | 2 + .../vshn/appcat/appcat/10_provider_helm.yaml | 35 +++++--- .../appcat/appcat/10_provider_kubernetes.yaml | 35 +++++--- .../vshn/appcat/appcat/10_provider_minio.yaml | 35 +++++--- .../appcat/10_runtimeconfig_appcat.yaml | 18 ---- .../appcat/10_runtimeconfig_default.yaml | 14 ---- .../10_runtimeconfig_function_appcat.yaml | 19 +++++ .../appcat/10_runtimeconfig_function_pnt.yaml | 15 ++++ .../appcat/20_serviceaccount_appcat.yaml | 8 ++ .../appcat/appcat/20_serviceaccount_pnt.yaml | 8 ++ 72 files changed, 660 insertions(+), 347 deletions(-) rename component/tests/golden/apiserver/appcat/appcat/{10_runtimeconfig_appcat.yaml => 10_runtimeconfig_function_appcat.yaml} (84%) rename component/tests/golden/{controllers/appcat/appcat/10_runtimeconfig_default.yaml => apiserver/appcat/appcat/10_runtimeconfig_function_pnt.yaml} (74%) create mode 100644 component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_pnt.yaml rename component/tests/golden/{controllers/appcat/appcat/10_runtimeconfig_appcat.yaml => cloudscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml} (84%) rename component/tests/golden/{apiserver/appcat/appcat/10_runtimeconfig_default.yaml => cloudscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml} (74%) create mode 100644 component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_pnt.yaml rename component/tests/golden/{cloudscale/appcat/appcat/10_runtimeconfig_appcat.yaml => controllers/appcat/appcat/10_runtimeconfig_function_appcat.yaml} (84%) rename component/tests/golden/{defaults/appcat/appcat/10_runtimeconfig_default.yaml => controllers/appcat/appcat/10_runtimeconfig_function_pnt.yaml} (74%) create mode 100644 component/tests/golden/controllers/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/controllers/appcat/appcat/20_serviceaccount_pnt.yaml rename component/tests/golden/defaults/appcat/appcat/{10_runtimeconfig_appcat.yaml => 10_runtimeconfig_function_appcat.yaml} (84%) rename component/tests/golden/{cloudscale/appcat/appcat/10_runtimeconfig_default.yaml => defaults/appcat/appcat/10_runtimeconfig_function_pnt.yaml} (74%) create mode 100644 component/tests/golden/defaults/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/defaults/appcat/appcat/20_serviceaccount_pnt.yaml delete mode 100644 component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_appcat.yaml delete mode 100644 component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_default.yaml create mode 100644 component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml create mode 100644 component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml create mode 100644 component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_pnt.yaml delete mode 100644 component/tests/golden/minio/appcat/appcat/10_runtimeconfig_appcat.yaml delete mode 100644 component/tests/golden/minio/appcat/appcat/10_runtimeconfig_default.yaml create mode 100644 component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_appcat.yaml create mode 100644 component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_pnt.yaml create mode 100644 component/tests/golden/minio/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/minio/appcat/appcat/20_serviceaccount_pnt.yaml delete mode 100644 component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_appcat.yaml delete mode 100644 component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_default.yaml create mode 100644 component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_appcat.yaml create mode 100644 component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_pnt.yaml create mode 100644 component/tests/golden/openshift/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/openshift/appcat/appcat/20_serviceaccount_pnt.yaml delete mode 100644 component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_appcat.yaml delete mode 100644 component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_default.yaml create mode 100644 component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_appcat.yaml create mode 100644 component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_pnt.yaml create mode 100644 component/tests/golden/vshn/appcat/appcat/20_serviceaccount_appcat.yaml create mode 100644 component/tests/golden/vshn/appcat/appcat/20_serviceaccount_pnt.yaml diff --git a/component/class/defaults.yml b/component/class/defaults.yml index cce136d7d..03bf906a7 100644 --- a/component/class/defaults.yml +++ b/component/class/defaults.yml @@ -58,6 +58,7 @@ parameters: namespace: syn-appcat namespaceLabels: {} namespaceAnnotations: {} + crossplaneNamespace: ${crossplane:namespace} appuioManaged: true tenantID: ${cluster:tenant} @@ -198,7 +199,8 @@ parameters: CLOUDSCALE_API_TOKEN: "?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/objectstorage/provider-cloudscale/token}" spec: package: ${appcat:images:provider-cloudscale:registry}/${appcat:images:provider-cloudscale:repository}:${appcat:images:provider-cloudscale:tag} - controllerConfig: {} + runtimeConfig: + serviceAccountName: provider-cloudscale providerConfig: {} exoscale: @@ -212,7 +214,8 @@ parameters: EXOSCALE_API_SECRET: "?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/provider-exoscale/secret-key}" spec: package: ${appcat:images:provider-exoscale:registry}/${appcat:images:provider-exoscale:repository}:${appcat:images:provider-exoscale:tag} - controllerConfig: {} + runtimeConfig: + serviceAccountName: provider-exoscale providerConfig: {} kubernetes: @@ -220,7 +223,7 @@ parameters: namespace: ${crossplane:namespace} spec: package: ${appcat:images:provider-kubernetes:registry}/${appcat:images:provider-kubernetes:repository}:${appcat:images:provider-kubernetes:tag} - controllerConfig: + runtimeConfig: serviceAccountName: provider-kubernetes providerConfig: {} @@ -229,7 +232,7 @@ parameters: namespace: ${crossplane:namespace} spec: package: ${appcat:images:provider-helm:registry}/${appcat:images:provider-helm:repository}:${appcat:images:provider-helm:tag} - controllerConfig: + runtimeConfig: serviceAccountName: provider-helm providerConfig: {} @@ -238,7 +241,7 @@ parameters: namespace: ${crossplane:namespace} spec: package: ${appcat:images:provider-minio:registry}/${appcat:images:provider-minio:repository}:${appcat:images:provider-minio:tag} - controllerConfig: + runtimeConfig: serviceAccountName: provider-minio providerConfigRefs: [] additionalProviderConfigs: [] diff --git a/component/component/common.libsonnet b/component/component/common.libsonnet index e80a60c22..bb3116a98 100644 --- a/component/component/common.libsonnet +++ b/component/component/common.libsonnet @@ -170,6 +170,34 @@ local defaultReadinessCheck() = { ], }; +local defaultRuntimeConfigWithSaName(name) = { + apiVersion: 'pkg.crossplane.io/v1beta1', + kind: 'DeploymentRuntimeConfig', + metadata: { + name: name, + }, + spec: { + deploymentTemplate: { + spec: { + selector: {}, + template: { + spec: + { + containers: [ + { + name: 'package-runtime', + securityContext: {}, + }, + ], + securityContext: {}, + serviceAccountName: name, + }, + }, + }, + }, + }, +}; + { SyncOptions: syncOptions, VshnMetaDBaaSExoscale(dbname): @@ -202,4 +230,6 @@ local defaultReadinessCheck() = { emailAlerting(alertingSettings), DefaultReadinessCheck(): defaultReadinessCheck(), + DefaultRuntimeConfigWithSaName(name): + defaultRuntimeConfigWithSaName(name), } diff --git a/component/component/functions.jsonnet b/component/component/functions.jsonnet index 503804f9f..767cd89a2 100644 --- a/component/component/functions.jsonnet +++ b/component/component/functions.jsonnet @@ -10,7 +10,7 @@ local params = inv.parameters.appcat; local appcatImage = params.images.functionAppcat; local pntImage = params.images.functionpnt; -local getFunction(name, package) = { +local getFunction(name, package, runtimeConfigName) = { apiVersion: 'pkg.crossplane.io/v1beta1', kind: 'Function', metadata: { @@ -18,6 +18,9 @@ local getFunction(name, package) = { }, spec: { package: package, + runtimeConfigRef: { + name: runtimeConfigName, + }, }, }; @@ -25,7 +28,7 @@ local appcatRuntimeConfig = { apiVersion: 'pkg.crossplane.io/v1beta1', kind: 'DeploymentRuntimeConfig', metadata: { - name: 'appcat-runtime-config', + name: 'function-appcat', }, spec: { deploymentTemplate: { @@ -43,6 +46,7 @@ local appcatRuntimeConfig = { }, ], securityContext: {}, + serviceAccountName: 'function-appcat', }, }, }, @@ -50,51 +54,31 @@ local appcatRuntimeConfig = { }, }; -local defaultRuntimeConfig = { - apiVersion: 'pkg.crossplane.io/v1beta1', - kind: 'DeploymentRuntimeConfig', - metadata: { - name: 'default', - }, - spec: { - deploymentTemplate: { - spec: { - selector: {}, - template: { - spec: - { - containers: [ - { - name: 'package-runtime', - securityContext: {}, - }, - ], - securityContext: {}, - }, - }, - }, - }, - }, -}; - - local appcatImageTag = std.strReplace(appcatImage.tag, '/', '_'); local appcatFunctionImage = appcatImage.registry + '/' + appcatImage.repository + ':' + appcatImageTag; -local appcat = getFunction('function-appcat', appcatFunctionImage) + { - spec+: { - runtimeConfigRef: { - name: 'appcat-runtime-config', - }, +local appcat = getFunction('function-appcat', appcatFunctionImage, 'function-appcat'); + +local saAppCat = kube.ServiceAccount('function-appcat') { + metadata+: { + namespace: params.crossplaneNamespace, + }, +}; + +local saPnT = kube.ServiceAccount('function-patch-and-transform') { + metadata+: { + namespace: params.crossplaneNamespace, }, }; local pntFunctionImage = pntImage.registry + '/' + pntImage.repository + ':' + pntImage.tag; { - '10_function_patch_and_transform': getFunction('function-patch-and-transform', pntFunctionImage), + '10_function_patch_and_transform': getFunction('function-patch-and-transform', pntFunctionImage, 'function-patch-and-transform'), '10_function_appcat': appcat, - '10_runtimeconfig_appcat': appcatRuntimeConfig, - '10_runtimeconfig_default': defaultRuntimeConfig, + '10_runtimeconfig_function_appcat': appcatRuntimeConfig, + '10_runtimeconfig_function_pnt': common.DefaultRuntimeConfigWithSaName('function-patch-and-transform'), + '20_serviceaccount_appcat': saAppCat, + '20_serviceaccount_pnt': saPnT, } diff --git a/component/component/provider.jsonnet b/component/component/provider.jsonnet index e78f63f21..9f3d14a43 100644 --- a/component/component/provider.jsonnet +++ b/component/component/provider.jsonnet @@ -21,43 +21,26 @@ local providerSecret(credentials) = stringData: credentials.data, }; - -local isOpenshift = std.startsWith(inv.parameters.facts.distribution, 'openshift'); -local openshiftControllerConfig = - (if isOpenshift then { - podSecurityContext: {}, - securityContext: {}, - } - else {}); - - -local controllerConfig(name, config) = - local spec = config + openshiftControllerConfig; - if spec != {} then - [ - crossplane.ControllerConfig(name) { - spec+: spec, - }, - ] - else []; - -local controllerConfigRef(config) = - if config != [] then - { - controllerConfigRef: { - name: config[0].metadata.name, - }, - } - else {}; +local runtimeConfigRef(name) = { + runtimeConfigRef: { + name: name, + }, +}; { [if params.providers.cloudscale.enabled then '10_provider_cloudscale']: local provider = params.providers.cloudscale; - local controllerConf = controllerConfig('cloudscale', provider.controllerConfig); + local sa = kube.ServiceAccount(provider.runtimeConfig.serviceAccountName) { + metadata+: { + namespace: provider.namespace, + }, + }; + + local runtimeConf = [ common.DefaultRuntimeConfigWithSaName(sa.metadata.name) ]; [ crossplane.Provider('provider-cloudscale') { - spec+: provider.spec + controllerConfigRef(controllerConf), + spec+: provider.spec + runtimeConfigRef(sa.metadata.name), }, crossplane.ProviderConfig('cloudscale') { apiVersion: 'cloudscale.crossplane.io/v1', @@ -74,7 +57,7 @@ local controllerConfigRef(config) = }, ] + - controllerConf + runtimeConf + [ providerSecret(provider.credentials), @@ -83,10 +66,16 @@ local controllerConfigRef(config) = [if params.providers.exoscale.enabled then '10_provider_exoscale']: local provider = params.providers.exoscale; - local controllerConf = controllerConfig('exoscale', provider.controllerConfig); + local sa = kube.ServiceAccount(provider.runtimeConfig.serviceAccountName) { + metadata+: { + namespace: provider.namespace, + }, + }; + + local runtimeConf = [ common.DefaultRuntimeConfigWithSaName(sa.metadata.name) ]; [ crossplane.Provider('provider-exoscale') { - spec+: provider.spec + controllerConfigRef(controllerConf), + spec+: provider.spec + runtimeConfigRef(sa.metadata.name), }, crossplane.ProviderConfig('exoscale') { apiVersion: 'exoscale.crossplane.io/v1', @@ -103,7 +92,7 @@ local controllerConfigRef(config) = }, ] + - controllerConf + runtimeConf + [ providerSecret(provider.credentials), @@ -112,7 +101,7 @@ local controllerConfigRef(config) = [if params.providers.kubernetes.enabled then '10_provider_kubernetes']: local provider = params.providers.kubernetes; - local sa = kube.ServiceAccount(provider.controllerConfig.serviceAccountName) { + local sa = kube.ServiceAccount(provider.runtimeConfig.serviceAccountName) { metadata+: { namespace: provider.namespace, }, @@ -232,17 +221,17 @@ local controllerConfigRef(config) = subjects_: [ sa ], }; - local controllerConf = controllerConfig('kubernetes', provider.controllerConfig); + local runtimeConf = [ common.DefaultRuntimeConfigWithSaName(sa.metadata.name) ]; [ // Very important: DON'T NAME THIS JUST `kubernetes` YOU WILL BREAK ALL PROVIDERS! // https://crossplane.slack.com/archives/CEG3T90A1/p1699871771723179 crossplane.Provider('provider-kubernetes') { - spec+: provider.spec + controllerConfigRef(controllerConf), + spec+: provider.spec + runtimeConfigRef(sa.metadata.name), }, ] + - controllerConf + runtimeConf + [ @@ -255,13 +244,14 @@ local controllerConfigRef(config) = } ), }, + sa, role, rolebinding, ], [if params.providers.helm.enabled then '10_provider_helm']: local provider = params.providers.helm; - local sa = kube.ServiceAccount(provider.controllerConfig.serviceAccountName) { + local sa = kube.ServiceAccount(provider.runtimeConfig.serviceAccountName) { metadata+: { namespace: provider.namespace, }, @@ -301,15 +291,15 @@ local controllerConfigRef(config) = }; - local controllerConf = controllerConfig('helm', provider.controllerConfig); + local runtimeConf = [ common.DefaultRuntimeConfigWithSaName(sa.metadata.name) ]; [ crossplane.Provider('provider-helm') { - spec+: provider.spec + controllerConfigRef(controllerConf), + spec+: provider.spec + runtimeConfigRef(sa.metadata.name), }, ] + - controllerConf + runtimeConf + [ @@ -322,13 +312,14 @@ local controllerConfigRef(config) = } ), }, + sa, role, rolebinding, ], [if params.providers.minio.enabled then '10_provider_minio']: local provider = params.providers.minio; - local sa = kube.ServiceAccount(provider.controllerConfig.serviceAccountName) { + local sa = kube.ServiceAccount(provider.runtimeConfig.serviceAccountName) { metadata+: { namespace: provider.namespace, }, @@ -353,15 +344,15 @@ local controllerConfigRef(config) = }; - local controllerConf = controllerConfig('minio', provider.controllerConfig); + local runtimeConf = [ common.DefaultRuntimeConfigWithSaName(sa.metadata.name) ]; [ crossplane.Provider('provider-minio') { - spec+: provider.spec + controllerConfigRef(controllerConf), + spec+: provider.spec + runtimeConfigRef(sa.metadata.name), }, ] + - controllerConf + runtimeConf + [ crossplane.ProviderConfig(config.name) { @@ -376,6 +367,7 @@ local controllerConfigRef(config) = for config in provider.additionalProviderConfigs ] + [ + sa, role, rolebinding, ], diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/apiserver/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/apiserver/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_appcat.yaml similarity index 84% rename from component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_appcat.yaml rename to component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_appcat.yaml index f37fe38b8..68f992b22 100644 --- a/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_appcat.yaml +++ b/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: appcat-runtime-config + name: function-appcat spec: deploymentTemplate: spec: @@ -16,3 +16,4 @@ spec: name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_pnt.yaml similarity index 74% rename from component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_default.yaml rename to component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_pnt.yaml index a68dfd674..3d7d001e1 100644 --- a/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_default.yaml +++ b/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: default + name: function-patch-and-transform spec: deploymentTemplate: spec: @@ -12,3 +12,4 @@ spec: - name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/apiserver/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_provider_cloudscale.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_provider_cloudscale.yaml index 54c8f32f2..8a56ac324 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_provider_cloudscale.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_provider_cloudscale.yaml @@ -9,6 +9,8 @@ metadata: name: provider-cloudscale spec: package: ghcr.io/vshn/provider-cloudscale/provider:v0.5.0 + runtimeConfigRef: + name: provider-cloudscale --- apiVersion: cloudscale.crossplane.io/v1 kind: ProviderConfig @@ -26,6 +28,22 @@ spec: namespace: syn-crossplane source: InjectedIdentity --- +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: provider-cloudscale +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-cloudscale +--- apiVersion: v1 data: {} kind: Secret diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml index 2335bf1a2..708554aa1 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml @@ -8,21 +8,25 @@ metadata: name: provider-kubernetes name: provider-kubernetes spec: - controllerConfigRef: - name: kubernetes package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 + runtimeConfigRef: + name: provider-kubernetes --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: kubernetes - name: kubernetes + name: provider-kubernetes spec: - serviceAccountName: provider-kubernetes + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-kubernetes --- apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-kubernetes + name: provider-kubernetes + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml similarity index 84% rename from component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_appcat.yaml rename to component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml index f37fe38b8..68f992b22 100644 --- a/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_appcat.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: appcat-runtime-config + name: function-appcat spec: deploymentTemplate: spec: @@ -16,3 +16,4 @@ spec: name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml similarity index 74% rename from component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_default.yaml rename to component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml index a68dfd674..3d7d001e1 100644 --- a/component/tests/golden/apiserver/appcat/appcat/10_runtimeconfig_default.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: default + name: function-patch-and-transform spec: deploymentTemplate: spec: @@ -12,3 +12,4 @@ spec: - name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/cloudscale/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/controllers/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/controllers/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_appcat.yaml similarity index 84% rename from component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_appcat.yaml rename to component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_appcat.yaml index f37fe38b8..68f992b22 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_appcat.yaml +++ b/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: appcat-runtime-config + name: function-appcat spec: deploymentTemplate: spec: @@ -16,3 +16,4 @@ spec: name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_pnt.yaml similarity index 74% rename from component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_default.yaml rename to component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_pnt.yaml index a68dfd674..3d7d001e1 100644 --- a/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_default.yaml +++ b/component/tests/golden/controllers/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: default + name: function-patch-and-transform spec: deploymentTemplate: spec: @@ -12,3 +12,4 @@ spec: - name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/controllers/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/defaults/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/defaults/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_appcat.yaml similarity index 84% rename from component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_appcat.yaml rename to component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_appcat.yaml index f37fe38b8..68f992b22 100644 --- a/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_appcat.yaml +++ b/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: appcat-runtime-config + name: function-appcat spec: deploymentTemplate: spec: @@ -16,3 +16,4 @@ spec: name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_pnt.yaml similarity index 74% rename from component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_default.yaml rename to component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_pnt.yaml index a68dfd674..3d7d001e1 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_runtimeconfig_default.yaml +++ b/component/tests/golden/defaults/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -1,7 +1,7 @@ apiVersion: pkg.crossplane.io/v1beta1 kind: DeploymentRuntimeConfig metadata: - name: default + name: function-patch-and-transform spec: deploymentTemplate: spec: @@ -12,3 +12,4 @@ spec: - name: package-runtime securityContext: {} securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/defaults/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/exoscale/appcat/appcat/10_provider_exoscale.yaml b/component/tests/golden/exoscale/appcat/appcat/10_provider_exoscale.yaml index 5ab7dc412..d029a775e 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_provider_exoscale.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_provider_exoscale.yaml @@ -9,6 +9,8 @@ metadata: name: provider-exoscale spec: package: ghcr.io/vshn/provider-exoscale/provider:v0.10.4 + runtimeConfigRef: + name: provider-exoscale --- apiVersion: exoscale.crossplane.io/v1 kind: ProviderConfig @@ -26,6 +28,22 @@ spec: namespace: crossplane-system source: InjectedIdentity --- +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: provider-exoscale +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-exoscale +--- apiVersion: v1 data: {} kind: Secret diff --git a/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml index ca0592e7e..0df180c85 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml @@ -8,21 +8,25 @@ metadata: name: provider-kubernetes name: provider-kubernetes spec: - controllerConfigRef: - name: kubernetes package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 + runtimeConfigRef: + name: provider-kubernetes --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: kubernetes - name: kubernetes + name: provider-kubernetes spec: - serviceAccountName: provider-kubernetes + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-kubernetes --- apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-kubernetes + name: provider-kubernetes + namespace: crossplane-system +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_appcat.yaml deleted file mode 100644 index f37fe38b8..000000000 --- a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_appcat.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: appcat-runtime-config -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - args: - - functions - command: - - appcat - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_default.yaml deleted file mode 100644 index a68dfd674..000000000 --- a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: default -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml new file mode 100644 index 000000000..68f992b22 --- /dev/null +++ b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -0,0 +1,19 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-appcat +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - args: + - functions + command: + - appcat + name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml new file mode 100644 index 000000000..3d7d001e1 --- /dev/null +++ b/component/tests/golden/exoscale/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -0,0 +1,15 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-patch-and-transform +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..deed60674 --- /dev/null +++ b/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: crossplane-system diff --git a/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..b54042de2 --- /dev/null +++ b/component/tests/golden/exoscale/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: crossplane-system diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/minio/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/minio/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/minio/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/minio/appcat/appcat/10_provider_helm.yaml b/component/tests/golden/minio/appcat/appcat/10_provider_helm.yaml index bd10c268d..1d3819d78 100644 --- a/component/tests/golden/minio/appcat/appcat/10_provider_helm.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_provider_helm.yaml @@ -8,21 +8,25 @@ metadata: name: provider-helm name: provider-helm spec: - controllerConfigRef: - name: helm package: xpkg.upbound.io/crossplane-contrib/provider-helm:v0.15.0 + runtimeConfigRef: + name: provider-helm --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: helm - name: helm + name: provider-helm spec: - serviceAccountName: provider-helm + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-helm --- apiVersion: helm.crossplane.io/v1beta1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-helm + name: provider-helm + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml index 2335bf1a2..708554aa1 100644 --- a/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml @@ -8,21 +8,25 @@ metadata: name: provider-kubernetes name: provider-kubernetes spec: - controllerConfigRef: - name: kubernetes package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 + runtimeConfigRef: + name: provider-kubernetes --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: kubernetes - name: kubernetes + name: provider-kubernetes spec: - serviceAccountName: provider-kubernetes + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-kubernetes --- apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-kubernetes + name: provider-kubernetes + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_appcat.yaml deleted file mode 100644 index f37fe38b8..000000000 --- a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_appcat.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: appcat-runtime-config -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - args: - - functions - command: - - appcat - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_default.yaml deleted file mode 100644 index a68dfd674..000000000 --- a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: default -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_appcat.yaml new file mode 100644 index 000000000..68f992b22 --- /dev/null +++ b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -0,0 +1,19 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-appcat +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - args: + - functions + command: + - appcat + name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_pnt.yaml b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_pnt.yaml new file mode 100644 index 000000000..3d7d001e1 --- /dev/null +++ b/component/tests/golden/minio/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -0,0 +1,15 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-patch-and-transform +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/minio/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/minio/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/minio/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/minio/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/minio/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/minio/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/openshift/appcat/appcat/10_provider_cloudscale.yaml b/component/tests/golden/openshift/appcat/appcat/10_provider_cloudscale.yaml index 5db2a9591..8a56ac324 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_provider_cloudscale.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_provider_cloudscale.yaml @@ -8,9 +8,9 @@ metadata: name: provider-cloudscale name: provider-cloudscale spec: - controllerConfigRef: - name: cloudscale package: ghcr.io/vshn/provider-cloudscale/provider:v0.5.0 + runtimeConfigRef: + name: provider-cloudscale --- apiVersion: cloudscale.crossplane.io/v1 kind: ProviderConfig @@ -28,18 +28,21 @@ spec: namespace: syn-crossplane source: InjectedIdentity --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: cloudscale - name: cloudscale + name: provider-cloudscale spec: - podSecurityContext: {} - securityContext: {} + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-cloudscale --- apiVersion: v1 data: {} diff --git a/component/tests/golden/openshift/appcat/appcat/10_provider_exoscale.yaml b/component/tests/golden/openshift/appcat/appcat/10_provider_exoscale.yaml index 2c8bd5b62..e83217d6a 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_provider_exoscale.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_provider_exoscale.yaml @@ -8,9 +8,9 @@ metadata: name: provider-exoscale name: provider-exoscale spec: - controllerConfigRef: - name: exoscale package: ghcr.io/vshn/provider-exoscale/provider:v0.10.4 + runtimeConfigRef: + name: provider-exoscale --- apiVersion: exoscale.crossplane.io/v1 kind: ProviderConfig @@ -28,18 +28,21 @@ spec: namespace: syn-crossplane source: InjectedIdentity --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: exoscale - name: exoscale + name: provider-exoscale spec: - podSecurityContext: {} - securityContext: {} + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-exoscale --- apiVersion: v1 data: {} diff --git a/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml index f0b297145..708554aa1 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml @@ -8,23 +8,25 @@ metadata: name: provider-kubernetes name: provider-kubernetes spec: - controllerConfigRef: - name: kubernetes package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 + runtimeConfigRef: + name: provider-kubernetes --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: kubernetes - name: kubernetes + name: provider-kubernetes spec: - podSecurityContext: {} - securityContext: {} - serviceAccountName: provider-kubernetes + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-kubernetes --- apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig @@ -39,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-kubernetes + name: provider-kubernetes + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_appcat.yaml deleted file mode 100644 index f37fe38b8..000000000 --- a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_appcat.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: appcat-runtime-config -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - args: - - functions - command: - - appcat - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_default.yaml deleted file mode 100644 index a68dfd674..000000000 --- a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: default -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_appcat.yaml new file mode 100644 index 000000000..68f992b22 --- /dev/null +++ b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -0,0 +1,19 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-appcat +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - args: + - functions + command: + - appcat + name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_pnt.yaml b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_pnt.yaml new file mode 100644 index 000000000..3d7d001e1 --- /dev/null +++ b/component/tests/golden/openshift/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -0,0 +1,15 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-patch-and-transform +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/openshift/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml index 3fa79b5e5..1c9dc8c59 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml @@ -5,4 +5,4 @@ metadata: spec: package: ghcr.io/vshn/appcat:v4.43.1-func runtimeConfigRef: - name: appcat-runtime-config + name: function-appcat diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_patch_and_transform.yaml b/component/tests/golden/vshn/appcat/appcat/10_function_patch_and_transform.yaml index c25485b3f..757bc9fbd 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_function_patch_and_transform.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_function_patch_and_transform.yaml @@ -4,3 +4,5 @@ metadata: name: function-patch-and-transform spec: package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.1.4 + runtimeConfigRef: + name: function-patch-and-transform diff --git a/component/tests/golden/vshn/appcat/appcat/10_provider_helm.yaml b/component/tests/golden/vshn/appcat/appcat/10_provider_helm.yaml index bd10c268d..1d3819d78 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_provider_helm.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_provider_helm.yaml @@ -8,21 +8,25 @@ metadata: name: provider-helm name: provider-helm spec: - controllerConfigRef: - name: helm package: xpkg.upbound.io/crossplane-contrib/provider-helm:v0.15.0 + runtimeConfigRef: + name: provider-helm --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: helm - name: helm + name: provider-helm spec: - serviceAccountName: provider-helm + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-helm --- apiVersion: helm.crossplane.io/v1beta1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-helm + name: provider-helm + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml index 2335bf1a2..708554aa1 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml @@ -8,21 +8,25 @@ metadata: name: provider-kubernetes name: provider-kubernetes spec: - controllerConfigRef: - name: kubernetes package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 + runtimeConfigRef: + name: provider-kubernetes --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: kubernetes - name: kubernetes + name: provider-kubernetes spec: - serviceAccountName: provider-kubernetes + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-kubernetes --- apiVersion: kubernetes.crossplane.io/v1alpha1 kind: ProviderConfig @@ -37,6 +41,15 @@ spec: credentials: source: InjectedIdentity --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-kubernetes + name: provider-kubernetes + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/vshn/appcat/appcat/10_provider_minio.yaml b/component/tests/golden/vshn/appcat/appcat/10_provider_minio.yaml index d7b375558..8e0134f32 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_provider_minio.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_provider_minio.yaml @@ -8,21 +8,25 @@ metadata: name: provider-minio name: provider-minio spec: - controllerConfigRef: - name: minio package: ghcr.io/vshn/provider-minio/provider:v0.1.0 + runtimeConfigRef: + name: provider-minio --- -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: '10' - labels: - name: minio - name: minio + name: provider-minio spec: - serviceAccountName: provider-minio + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: provider-minio --- apiVersion: minio.crossplane.io/v1 kind: ProviderConfig @@ -40,6 +44,15 @@ spec: namespace: syn-crossplane minioURL: http://minio-server.minio.svc:9000/ --- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: provider-minio + name: provider-minio + namespace: syn-crossplane +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_appcat.yaml deleted file mode 100644 index f37fe38b8..000000000 --- a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_appcat.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: appcat-runtime-config -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - args: - - functions - command: - - appcat - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_default.yaml b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_default.yaml deleted file mode 100644 index a68dfd674..000000000 --- a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: pkg.crossplane.io/v1beta1 -kind: DeploymentRuntimeConfig -metadata: - name: default -spec: - deploymentTemplate: - spec: - selector: {} - template: - spec: - containers: - - name: package-runtime - securityContext: {} - securityContext: {} diff --git a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_appcat.yaml new file mode 100644 index 000000000..68f992b22 --- /dev/null +++ b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_appcat.yaml @@ -0,0 +1,19 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-appcat +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - args: + - functions + command: + - appcat + name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-appcat diff --git a/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_pnt.yaml b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_pnt.yaml new file mode 100644 index 000000000..3d7d001e1 --- /dev/null +++ b/component/tests/golden/vshn/appcat/appcat/10_runtimeconfig_function_pnt.yaml @@ -0,0 +1,15 @@ +apiVersion: pkg.crossplane.io/v1beta1 +kind: DeploymentRuntimeConfig +metadata: + name: function-patch-and-transform +spec: + deploymentTemplate: + spec: + selector: {} + template: + spec: + containers: + - name: package-runtime + securityContext: {} + securityContext: {} + serviceAccountName: function-patch-and-transform diff --git a/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_appcat.yaml new file mode 100644 index 000000000..7b551f1ee --- /dev/null +++ b/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_appcat.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-appcat + name: function-appcat + namespace: syn-crossplane diff --git a/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_pnt.yaml b/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_pnt.yaml new file mode 100644 index 000000000..50f79d119 --- /dev/null +++ b/component/tests/golden/vshn/appcat/appcat/20_serviceaccount_pnt.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: {} + labels: + name: function-patch-and-transform + name: function-patch-and-transform + namespace: syn-crossplane