Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes a issue with multus and webhook not working when the manifest file is restored during a helm update #4361

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions charts/spiderpool/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ metadata:
{{- if .Values.global.commonLabels }}
{{- include "tplvalues.render" ( dict "value" .Values.global.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": pre-install
"helm.sh/resource_policy": keep
data:
cni-conf.json: |
{
Expand Down
10 changes: 10 additions & 0 deletions charts/spiderpool/templates/tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ metadata:
{{- if (eq .Values.spiderpoolController.tls.method "certmanager") }}
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.spiderpoolController.name | trunc 63 | trimSuffix "-" }}-server-certs
{{- end }}
"helm.sh/hook": pre-install
"helm.sh/resource_policy": keep
webhooks:
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -154,6 +156,8 @@ metadata:
{{- if (eq .Values.spiderpoolController.tls.method "certmanager") }}
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.spiderpoolController.name | trunc 63 | trimSuffix "-" }}-server-certs
{{- end }}
"helm.sh/hook": pre-install
"helm.sh/resource_policy": keep
webhooks:
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -324,6 +328,9 @@ kind: Secret
metadata:
name: {{ .Values.spiderpoolController.tls.secretName | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace }}
annotations:
"helm.sh/hook": pre-install
"helm.sh/resource_policy": keep
type: kubernetes.io/tls
data:
ca.crt: {{ .Values.spiderpoolController.tls.provided.tlsCa | required "missing spiderpoolController.tls.provided.tlsCa" }}
Expand All @@ -347,6 +354,9 @@ kind: Secret
metadata:
name: {{ .Values.spiderpoolController.tls.secretName | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace }}
annotations:
"helm.sh/hook": pre-install
"helm.sh/resource_policy": keep
type: kubernetes.io/tls
data:
ca.crt: {{ .ca.Cert | b64enc }}
Expand Down
Loading