diff --git a/cmd/k8s-operator/deploy/chart/templates/deployment.yaml b/cmd/k8s-operator/deploy/chart/templates/deployment.yaml index a451cf27f..ba1de9779 100644 --- a/cmd/k8s-operator/deploy/chart/templates/deployment.yaml +++ b/cmd/k8s-operator/deploy/chart/templates/deployment.yaml @@ -49,6 +49,8 @@ spec: image: {{ .Values.operatorConfig.image.repo }}{{- if .Values.operatorConfig.image.digest -}}{{ printf "@%s" .Values.operatorConfig.image.digest}}{{- else -}}{{ printf "%s" $operatorTag }}{{- end }} imagePullPolicy: {{ .Values.operatorConfig.image.pullPolicy }} env: + - name: OPERATOR_INITIAL_TAGS + value: {{ join "," .Values.operatorConfig.defaultTags }} - name: OPERATOR_HOSTNAME value: {{ .Values.operatorConfig.hostname }} - name: OPERATOR_SECRET diff --git a/cmd/k8s-operator/deploy/chart/values.yaml b/cmd/k8s-operator/deploy/chart/values.yaml index af16a9ffc..78479e5a0 100644 --- a/cmd/k8s-operator/deploy/chart/values.yaml +++ b/cmd/k8s-operator/deploy/chart/values.yaml @@ -15,6 +15,13 @@ oauth: {} installCRDs: "true" operatorConfig: + # ACL tag that operator will be tagged with. Operator must be made owner of + # these tags + # https://tailscale.com/kb/1236/kubernetes-operator/?q=operator#setting-up-the-kubernetes-operator + # Multiple tags are defined as array items and passed to the operator as a comma-separated string + defaultTags: + - "tag:k8s-operator" + image: repo: tailscale/k8s-operator # Digest will be prioritized over tag. If neither are set appVersion will be diff --git a/cmd/k8s-operator/deploy/manifests/operator.yaml b/cmd/k8s-operator/deploy/manifests/operator.yaml index 151eec620..057117b0e 100644 --- a/cmd/k8s-operator/deploy/manifests/operator.yaml +++ b/cmd/k8s-operator/deploy/manifests/operator.yaml @@ -284,6 +284,8 @@ spec: spec: containers: - env: + - name: OPERATOR_INITIAL_TAGS + value: tag:k8s-operator - name: OPERATOR_HOSTNAME value: tailscale-operator - name: OPERATOR_SECRET diff --git a/docs/windows/policy/tailscale.admx b/docs/windows/policy/tailscale.admx index 5a337de79..61cc0aeec 100644 --- a/docs/windows/policy/tailscale.admx +++ b/docs/windows/policy/tailscale.admx @@ -1,4 +1,4 @@ - +