diff --git a/chart/Chart.yaml b/chart/Chart.yaml index c224182..1bb640b 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: badhouseplants-net description: A Helm chart for Kubernetes type: application -version: 0.3.7 +version: 0.3.8 appVersion: "1.16.0" diff --git a/chart/templates/namespace.yaml b/chart/templates/namespace.yaml index b1bd790..a16fa00 100644 --- a/chart/templates/namespace.yaml +++ b/chart/templates/namespace.yaml @@ -3,4 +3,14 @@ apiVersion: v1 kind: Namespace metadata: name: {{ .Values.namespace.name }} + labels: + {{- include "badhouseplants-net.labels" . | nindent 4 }} + {{- range $key, $value := .Values.namespace.labels}} + {{ $key }}: {{ $value }} + {{- end }} + {{- with .Values.namespace.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} \ No newline at end of file diff --git a/chart/templates/nginx-config-cm.yaml b/chart/templates/nginx-config-cm.yaml index 2bcdf48..e8e1d38 100644 --- a/chart/templates/nginx-config-cm.yaml +++ b/chart/templates/nginx-config-cm.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: nginx-config + labels: + {{- include "badhouseplants-net.labels" . | nindent 4 }} data: default.conf: | server { diff --git a/chart/templates/rclone-config-sec.yaml b/chart/templates/rclone-config-sec.yaml index 7f0e023..8e20719 100644 --- a/chart/templates/rclone-config-sec.yaml +++ b/chart/templates/rclone-config-sec.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Secret metadata: name: rclone-config + labels: + {{- include "badhouseplants-net.labels" . | nindent 4 }} type: generic data: # the data is abbreviated in this example diff --git a/chart/templates/virtual-service.yaml b/chart/templates/virtual-service.yaml index 7ed54b4..652b4d0 100644 --- a/chart/templates/virtual-service.yaml +++ b/chart/templates/virtual-service.yaml @@ -2,13 +2,20 @@ apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: - annotations: - labels: name: blog-virtual-service + labels: + {{- include "badhouseplants-net.labels" . | nindent 4 }} + {{- with .Values.istio.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: gateways: - istio-system/badhouseplants-net - hosts: {{ .Values.istio.hosts }} + hosts: + {{- range .Values.istio.hosts}} + - {{ . }} + {{- end }} http: - match: - uri: diff --git a/chart/values.yaml b/chart/values.yaml index 04ddab5..175526b 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,6 +1,9 @@ replicaCount: 1 -namespace: +namespace: + annotations: {} + labels: + istio-injection: enabled enabled: true name: badhouseplants-application @@ -41,6 +44,7 @@ hugo: buildDrafts: false istio: + annotations: {} enabled: true hosts: - badhouseplants.net @@ -63,17 +67,11 @@ volumes: name: s3-data sizeLimit: 1Gi -# ------------------------------------- -# -- Default values that I haven't -# -- touched -# ------------------------------------- imagePullSecrets: [] nameOverride: "" fullnameOverride: "" -deployAnnotations: - keel.sh/trigger: poll - keel.sh/policy: 'force' +deployAnnotations: {} podSecurityContext: {} # fsGroup: 2000