Use .Release.Namespace instead of namespace value

This commit is contained in:
Otto Bittner 2022-10-26 10:36:04 +02:00
parent 34f729ccd2
commit 009b2e67e3
10 changed files with 11 additions and 10 deletions

View File

@ -9,4 +9,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: join-service name: join-service
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}

View File

@ -4,10 +4,11 @@ metadata:
name: join-config name: join-config
namespace: kube-system namespace: kube-system
data: data:
# mustToJson is required so the json-strings passed from go are properly quoted in the rendered yaml. # mustToJson is required so the json-strings passed from go are of type string in the rendered yaml.
enforcedPCRs: {{ .Values.enforcedPCRs | mustToJson }} enforcedPCRs: {{ .Values.enforcedPCRs | mustToJson }}
measurements: {{ .Values.measurements | mustToJson }} measurements: {{ .Values.measurements | mustToJson }}
{{- if eq .Values.csp "Azure" }} {{- if eq .Values.csp "Azure" }}
# ConfigMap.data is of type map[string]string. quote will not quote a quoted string.
enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest | quote }} enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest | quote }}
idkeydigest: {{ .Values.idkeydigest }} idkeydigest: {{ .Values.idkeydigest }}
{{- end }} {{- end }}

View File

@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: join-service name: join-service
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
component: join-service component: join-service
k8s-app: join-service k8s-app: join-service

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: join-service name: join-service
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
type: NodePort type: NodePort
selector: selector:

View File

@ -2,4 +2,4 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: join-service name: join-service
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}

View File

@ -9,4 +9,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: kms name: kms
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}

View File

@ -6,7 +6,7 @@ metadata:
k8s-app: kms k8s-app: kms
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
name: kms name: kms
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
selector: selector:
matchLabels: matchLabels:

View File

@ -3,7 +3,7 @@ kind: Secret
type: Opaque type: Opaque
metadata: metadata:
name: {{ .Values.masterSecretName }} name: {{ .Values.masterSecretName }}
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}
data: data:
mastersecret: {{ .Values.masterSecret }} mastersecret: {{ .Values.masterSecret }}
salt: {{ .Values.salt }} salt: {{ .Values.salt }}

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: kms name: kms
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
ports: ports:
- name: grpc - name: grpc

View File

@ -2,4 +2,4 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: kms name: kms
namespace: {{ .Values.namespace }} namespace: {{ .Release.Namespace }}