Skip to content

Commit 04fe71e

Browse files
Rico Guricogusk31337
authored
feat: helm chart crossplane-gardener-shoot-clusters - optional binding secret namespace definition added (#43)
* feat: add secretNamespace configuration for Gardener shoot clusters in YAML files * fix: update zone name from eu-central-1a to eu-west-1a in values.yaml * chore(ci): update helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml.version 0.0.13 -> 0.0.14 * chore(ci): update Helm Chart helm/charts/crossplane-gardener-shoot-clusters/README.md file * fix: update zone name from eu-west-1a to eu-central-1c in values.yaml * chore(ci): update Helm Chart helm/charts/crossplane-gardener-shoot-clusters/README.md file * fix: update zone name from eu-central-1c to eu-central-1a in values.yaml * chore(ci): update Helm Chart helm/charts/crossplane-gardener-shoot-clusters/README.md file * Apply suggestion from @sk31337 Co-authored-by: Steffen <[email protected]> * fix: update adminKubeconfigRequest to include secretNamespace in YAML files --------- Co-authored-by: ricogu <[email protected]> Co-authored-by: Steffen <[email protected]>
1 parent 03f59b3 commit 04fe71e

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed

helm/charts/crossplane-gardener-shoot-clusters/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ icon: "https://avatars.githubusercontent.com/u/45158470?s=48&v=4"
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.0.13
19+
version: 0.0.14
2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.

helm/charts/crossplane-gardener-shoot-clusters/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# crossplane-gardener-shoot-clusters
44

5-
![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)
5+
![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)
66

77
A Helm chart to template crossplane manifests to manage Gardener Shoot resources.
88

helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-aws.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ spec:
2424
confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD
2525
name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}}
2626
namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}}
27-
2827
spec:
2928
secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[].secretBindingName)" $shootCluster.secretBindingName}} ## Set your SecretBinding name
3029
cloudProfileName: aws

helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-azure.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ spec:
2323
annotations:
2424
confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD
2525
name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}}
26-
namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[]..projectNamespace)" $shootCluster.projectNamespace}}
27-
26+
namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}}
2827
spec:
2928
secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[]..secretBindingName)" $shootCluster.secretBindingName}} ## Set your SecretBinding name
3029
cloudProfileName: az

helm/charts/crossplane-gardener-shoot-clusters/templates/garden-manifests/gardener-shoot-cluster-gcp.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ spec:
2323
annotations:
2424
confirmation.gardener.cloud/deletion: "true" # otherwise it can't be destroyed using IAD
2525
name: {{required "A valid Gardener Shoot Name is required! (.Values.shootClusters[].name)" $shootCluster.name}}
26-
namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}}
27-
26+
namespace: {{required "A valid Gardener Project Namespace is required! (.Values.shootClusters[].projectNamespace)" $shootCluster.projectNamespace}}
2827
spec:
2928
secretBindingName: {{required "A valid Secret Binding Name is required! (.Values.shootClusters[].secretBindingName)" $shootCluster.secretBindingName}} # Set your SecretBinding name
3029
cloudProfileName: gcp

helm/charts/crossplane-gardener-shoot-clusters/templates/mcp-manifests/admin-kubeconfig-request.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ spec:
1616
name: {{ required "A valid value is required! (.Values.shootClusters[].gardenerOrchestrateCloudProviderConfigRefName)" $shootCluster.gardenerOrchestrateCloudProviderConfigRefName | quote}}
1717
writeConnectionSecretToRef:
1818
name: gardener-shoot-kubeconfig-{{required "A valid value is required! (.Values.shootClusters[].name)" $shootCluster.name}}
19+
{{- if $shootCluster.adminKubeconfigRequest }}
20+
namespace: {{ $shootCluster.adminKubeconfigRequest.secretNamespace | default "default" | quote }}
21+
{{- else }}
1922
namespace: default
23+
{{- end }}
2024
{{- end }}
2125
{{- end }}

helm/charts/crossplane-gardener-shoot-clusters/values.ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ shootClusters:
1919
maintenance: {}
2020
addons: {}
2121
networking: {}
22-
infrastructureConfig: {}
22+
infrastructureConfig: {}
23+
adminKubeconfigRequest:
24+
secretNamespace: "test-namespace"
2325
- name: "iad-test-gcp"
2426
kubernetesCrossplaneProviderConfigRefName: "garden-co-golden"
2527
gardenerOrchestrateCloudProviderConfigRefName: "garden-co-golden"

helm/charts/crossplane-gardener-shoot-clusters/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,7 @@ shootClusters:
211211
extensions: []
212212
# --
213213
resources: []
214+
# namespace of the secret from adminKubeconfigRequest:
215+
adminKubeconfigRequest:
216+
secretNamespace: ""
214217
#########################################################################################################

0 commit comments

Comments
 (0)