diff --git a/helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml b/helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml index e3f5430..1fb61b5 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml @@ -16,7 +16,7 @@ icon: "https://avatars.githubusercontent.com/u/45158470?s=48&v=4" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.13 +version: 0.0.14 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/helm/charts/crossplane-gardener-shoot-clusters/README.md b/helm/charts/crossplane-gardener-shoot-clusters/README.md index 66ddbec..874b228 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/README.md +++ b/helm/charts/crossplane-gardener-shoot-clusters/README.md @@ -2,7 +2,7 @@ # crossplane-gardener-shoot-clusters -![Version: 0.0.13](https://img.shields.io/badge/Version-0.0.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square) +![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square) A Helm chart to template crossplane manifests to manage Gardener Shoot resources. diff --git a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-aws.yaml b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-aws.yaml index 30cf456..c7ca2af 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-aws.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-aws.yaml @@ -24,7 +24,6 @@ spec: confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}} namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}} - spec: secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[].secretBindingName)" $shootCluster.secretBindingName}} ## Set your SecretBinding name cloudProfileName: aws diff --git a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-azure.yaml b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-azure.yaml index 8ffd57a..437b522 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-azure.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-azure.yaml @@ -23,8 +23,7 @@ spec: annotations: confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}} - namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[]..projectNamespace)" $shootCluster.projectNamespace}} - + namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}} spec: secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[]..secretBindingName)" $shootCluster.secretBindingName}} ## Set your SecretBinding name cloudProfileName: az diff --git a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-gcp.yaml b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-gcp.yaml index 1fd832c..05c9c1d 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-gcp.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-gcp.yaml @@ -23,8 +23,7 @@ spec: annotations: confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}} - namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}} - + namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}} spec: secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[].secretBindingName)" $shootCluster.secretBindingName}} # Set your SecretBinding name cloudProfileName: gcp diff --git a/helm/charts/crossplane-gardener-shoot-clusters/templates/mcp-manifests/admin-kubeconfig-request.yaml b/helm/charts/crossplane-gardener-shoot-clusters/templates/mcp-manifests/admin-kubeconfig-request.yaml index 67dddef..f2f67ae 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/templates/mcp-manifests/admin-kubeconfig-request.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/templates/mcp-manifests/admin-kubeconfig-request.yaml @@ -16,6 +16,10 @@ spec: name: {{ required "A valid value is required! (.Values.shootClusters[].gardenerOrchestrateCloudProviderConfigRefName)" $shootCluster.gardenerOrchestrateCloudProviderConfigRefName | quote}} writeConnectionSecretToRef: name: gardener-shoot-kubeconfig-{{required "A valid value is required! (.Values.shootClusters[].name)" $shootCluster.name}} + {{- if $shootCluster.adminKubeconfigRequest }} + namespace: {{ $shootCluster.adminKubeconfigRequest.secretNamespace | default "default" | quote }} + {{- else }} namespace: default + {{- end }} {{- end }} {{- end }} diff --git a/helm/charts/crossplane-gardener-shoot-clusters/values.ci.yaml b/helm/charts/crossplane-gardener-shoot-clusters/values.ci.yaml index 68e0881..601a000 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/values.ci.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/values.ci.yaml @@ -19,7 +19,9 @@ shootClusters: maintenance: {} addons: {} networking: {} - infrastructureConfig: {} + infrastructureConfig: {} + adminKubeconfigRequest: + secretNamespace: "test-namespace" - name: "iad-test-gcp" kubernetesCrossplaneProviderConfigRefName: "garden-co-golden" gardenerOrchestrateCloudProviderConfigRefName: "garden-co-golden" diff --git a/helm/charts/crossplane-gardener-shoot-clusters/values.yaml b/helm/charts/crossplane-gardener-shoot-clusters/values.yaml index c808d05..9e7778a 100644 --- a/helm/charts/crossplane-gardener-shoot-clusters/values.yaml +++ b/helm/charts/crossplane-gardener-shoot-clusters/values.yaml @@ -211,4 +211,7 @@ shootClusters: extensions: [] # -- resources: [] + # namespace of the secret from adminKubeconfigRequest: + adminKubeconfigRequest: + secretNamespace: "" ######################################################################################################### \ No newline at end of file