diff --git a/charts/openstack-cluster/templates/_helpers.tpl b/charts/openstack-cluster/templates/_helpers.tpl index e590614..240e8c3 100644 --- a/charts/openstack-cluster/templates/_helpers.tpl +++ b/charts/openstack-cluster/templates/_helpers.tpl @@ -26,15 +26,15 @@ Common labels */}} {{- define "openstack-cluster.commonLabels" -}} helm.sh/chart: {{ include "openstack-cluster.chart" . }} -capi.stackhpc.com/managed-by: {{ .Release.Service }} -capi.stackhpc.com/infrastructure-provider: openstack +{{ .Values.projectPrefix }}/managed-by: {{ .Release.Service }} +{{ .Values.projectPrefix }}/infrastructure-provider: openstack {{- end -}} {{/* Selector labels for cluster-level resources */}} {{- define "openstack-cluster.selectorLabels" -}} -capi.stackhpc.com/cluster: {{ include "openstack-cluster.clusterName" . }} +{{ .Values.projectPrefix }}/cluster: {{ include "openstack-cluster.clusterName" . }} {{- end -}} {{/* @@ -52,7 +52,7 @@ Selector labels for component-level resources {{- $ctx := index . 0 -}} {{- $componentName := index . 1 -}} {{ include "openstack-cluster.selectorLabels" $ctx }} -capi.stackhpc.com/component: {{ $componentName }} +{{ $ctx.Values.projectPrefix }}/component: {{ $componentName }} {{- end -}} {{/* diff --git a/charts/openstack-cluster/templates/autoscaler/deployment.yaml b/charts/openstack-cluster/templates/autoscaler/deployment.yaml index 8dd610a..2b4867e 100644 --- a/charts/openstack-cluster/templates/autoscaler/deployment.yaml +++ b/charts/openstack-cluster/templates/autoscaler/deployment.yaml @@ -7,13 +7,13 @@ spec: replicas: 1 selector: matchLabels: - capi.stackhpc.com/cluster: {{ include "openstack-cluster.clusterName" . }} - capi.stackhpc.com/component: autoscaler + {{ .Values.projectPrefix }}/cluster: {{ include "openstack-cluster.clusterName" . }} + {{ .Values.projectPrefix }}/component: autoscaler template: metadata: labels: - capi.stackhpc.com/cluster: {{ include "openstack-cluster.clusterName" . }} - capi.stackhpc.com/component: autoscaler + {{ .Values.projectPrefix }}/cluster: {{ include "openstack-cluster.clusterName" . }} + {{ .Values.projectPrefix }}/component: autoscaler spec: serviceAccountName: {{ include "openstack-cluster.componentName" (list . "autoscaler") }} {{- with .Values.autoscaler.imagePullSecrets }} diff --git a/charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml b/charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml index acac20a..2d3c9cd 100644 --- a/charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml +++ b/charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml @@ -46,7 +46,7 @@ metadata: name: {{ include "openstack-cluster.controlplane.mt.name" . }} labels: {{ include "openstack-cluster.componentLabels" (list . "control-plane") | nindent 4 }} annotations: - capi.stackhpc.com/template-checksum: {{ include "openstack-cluster.controlplane.mt.checksum" . }} + {{ .Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.controlplane.mt.checksum" . }} # We let Cluster API clean up the cluster resources # Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions helm.sh/resource-policy: keep diff --git a/charts/openstack-cluster/templates/node-group/kubeadm-config-template.yaml b/charts/openstack-cluster/templates/node-group/kubeadm-config-template.yaml index f5da7de..f749723 100644 --- a/charts/openstack-cluster/templates/node-group/kubeadm-config-template.yaml +++ b/charts/openstack-cluster/templates/node-group/kubeadm-config-template.yaml @@ -37,9 +37,9 @@ metadata: name: {{ include "openstack-cluster.nodegroup.kct.name" (list $ $nodeGroup) }} labels: {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} annotations: - capi.stackhpc.com/template-checksum: {{ include "openstack-cluster.nodegroup.kct.checksum" (list $ $nodeGroup) }} + {{ $.Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.nodegroup.kct.checksum" (list $ $nodeGroup) }} # We let Cluster API clean up the cluster resources # Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions helm.sh/resource-policy: keep diff --git a/charts/openstack-cluster/templates/node-group/machine-deployment.yaml b/charts/openstack-cluster/templates/node-group/machine-deployment.yaml index 0b1aeea..b4a2f9c 100644 --- a/charts/openstack-cluster/templates/node-group/machine-deployment.yaml +++ b/charts/openstack-cluster/templates/node-group/machine-deployment.yaml @@ -7,7 +7,7 @@ metadata: name: {{ include "openstack-cluster.componentName" (list $ $nodeGroup.name) }} labels: {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} {{- if $nodeGroup.autoscale }} {{- $machineCountMin := $nodeGroup.machineCountMin | @@ -36,12 +36,12 @@ spec: selector: matchLabels: {{- include "openstack-cluster.componentSelectorLabels" (list $ "worker") | nindent 6 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} template: metadata: labels: {{- include "openstack-cluster.componentSelectorLabels" (list $ "worker") | nindent 8 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} spec: clusterName: {{ include "openstack-cluster.clusterName" $ }} version: {{ $.Values.kubernetesVersion }} diff --git a/charts/openstack-cluster/templates/node-group/machine-health-check.yaml b/charts/openstack-cluster/templates/node-group/machine-health-check.yaml index 4d9ac4d..1e23a64 100644 --- a/charts/openstack-cluster/templates/node-group/machine-health-check.yaml +++ b/charts/openstack-cluster/templates/node-group/machine-health-check.yaml @@ -8,13 +8,13 @@ metadata: name: {{ include "openstack-cluster.componentName" (list $ $nodeGroup.name) }} labels: {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} spec: clusterName: {{ include "openstack-cluster.clusterName" $ }} selector: matchLabels: {{- include "openstack-cluster.componentSelectorLabels" (list $ "worker") | nindent 6 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} {{- toYaml $nodeGroup.healthCheck.spec | nindent 2 }} {{- end }} {{- end }} diff --git a/charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml b/charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml index a81bf41..aadb37e 100644 --- a/charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml +++ b/charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml @@ -53,9 +53,9 @@ metadata: name: {{ include "openstack-cluster.nodegroup.mt.name" (list $ $nodeGroup) }} labels: {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }} - capi.stackhpc.com/node-group: {{ $nodeGroup.name }} + {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }} annotations: - capi.stackhpc.com/template-checksum: {{ include "openstack-cluster.nodegroup.mt.checksum" (list $ $nodeGroup) }} + {{ $.Values.projectPrefix }}/template-checksum: {{ include "openstack-cluster.nodegroup.mt.checksum" (list $ $nodeGroup) }} # We let Cluster API clean up the cluster resources # Deleting them ourselves, which CAPI is not expecting, can cause some nasty race conditions helm.sh/resource-policy: keep diff --git a/charts/openstack-cluster/values.yaml b/charts/openstack-cluster/values.yaml index 87f0360..e448d47 100644 --- a/charts/openstack-cluster/values.yaml +++ b/charts/openstack-cluster/values.yaml @@ -24,6 +24,9 @@ machineImageId: # The name of the SSH key to inject into cluster machines machineSSHKeyName: +# The prefix used for project labels and annotations +projectPrefix: capi.stackhpc.com + # Values for the Kubernetes cluster network kubeNetwork: # By default, use the private network range 172.16.0.0/12 for the cluster network