From fbb6e4eec5443d09f4355b008765f13790bf2ef5 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Wed, 31 Aug 2022 11:08:20 +0200 Subject: [PATCH] chore(helm)!: repository and version override for addons --- charts/kamaji/Chart.yaml | 2 +- charts/kamaji/crds/tenantcontrolplane.yaml | 35 +++++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/charts/kamaji/Chart.yaml b/charts/kamaji/Chart.yaml index 9267942..4b9c167 100644 --- a/charts/kamaji/Chart.yaml +++ b/charts/kamaji/Chart.yaml @@ -15,7 +15,7 @@ type: application # 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.6.0 +version: 0.7.0 # 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 diff --git a/charts/kamaji/crds/tenantcontrolplane.yaml b/charts/kamaji/crds/tenantcontrolplane.yaml index 6611575..23475d7 100644 --- a/charts/kamaji/crds/tenantcontrolplane.yaml +++ b/charts/kamaji/crds/tenantcontrolplane.yaml @@ -63,10 +63,24 @@ spec: description: Addons contain which addons are enabled properties: coreDNS: - description: AddonSpec defines the spec for every addon. + description: Enables the DNS addon in the Tenant Cluster. The + registry and the tag are configurable, the image is hard-coded + to `coredns`. + properties: + imageRepository: + description: ImageRepository sets the container registry to + pull images from. if not set, the default ImageRepository + will be used instead. + type: string + imageTag: + description: ImageTag allows to specify a tag for the image. + In case this value is set, kubeadm does not change automatically + the version of the above components during upgrades. + type: string type: object konnectivity: - description: KonnectivitySpec defines the spec for Konnectivity. + description: Enables the Konnectivity addon in the Tenant Cluster, + required if the worker nodes are in a different network. properties: agentImage: default: registry.k8s.io/kas-network-proxy/proxy-agent @@ -118,12 +132,19 @@ spec: - proxyPort type: object kubeProxy: + description: Enables the kube-proxy addon in the Tenant Cluster. + The registry and the tag are configurable, the image is hard-coded + to `kube-proxy`. properties: - imageOverride: - description: Specify the image overried of the kube-proxy - to install in the Tenant Cluster. If not specified, the - Kubernetes default one will be used, according to the specified - version. + imageRepository: + description: ImageRepository sets the container registry to + pull images from. if not set, the default ImageRepository + will be used instead. + type: string + imageTag: + description: ImageTag allows to specify a tag for the image. + In case this value is set, kubeadm does not change automatically + the version of the above components during upgrades. type: string type: object type: object