Skip to content

fix(cert-upgrader): remove hardcoded cert-upgrader-uid annotation to prevent Helm drift #543

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.

Sign up for GitHub

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

Open
isantospardo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(cert-upgrader): remove hardcoded cert-upgrader-uid annotation to prevent Helm drift #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions charts/core/templates/upgrader-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ kind: CronJob
metadata:
name: neuvector-cert-upgrader-pod
namespace: {{ .Release.Namespace }}
{{- with .Values.controller.certupgrader.annotations }}
annotations:
cert-upgrader-uid: ""
{{ toYaml . | nindent 4 }}
{{- end }}
labels:
chart: {{ template "neuvector.chart" . }}
release: {{ .Release.Name }}
Expand Down Expand Up @@ -76,8 +78,8 @@ spec:
image: {{ include "neuvector.controller.image" . | quote }}
imagePullPolicy: {{ .Values.controller.certupgrader.imagePullPolicy }}
resources:
{{ toYaml .Values.controller.certupgrader.resources | indent 16 }}
command:
{{ toYaml .Values.controller.certupgrader.resources | indent 16 }}
command:
- /usr/local/bin/upgrader
- upgrader-job
{{- if and .Values.internal.autoRotateCert }}
Expand Down
19 changes: 11 additions & 8 deletions charts/core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ autoGenerateCert: true

defaultValidityPeriod: 365

internal:
internal:
certmanager: # enable when cert-manager is installed for the internal certificates
enabled: false
secretname: neuvector-internal
Expand Down Expand Up @@ -114,7 +114,7 @@ controller:
ctrlServerPort: 10443
type:
annotations: {}
nodePort:
nodePort:
# OpenShift Route configuration
# Controller supports HTTPS only, so edge termination not supported
route:
Expand Down Expand Up @@ -306,8 +306,11 @@ controller:
# default: "" (off)
schedule: ""
imagePullPolicy: IfNotPresent
timeout: 3600
timeout: 3600
priorityClassName:
annotations:
# cert-upgrader-uid: ""
tls: false
resources:
{}
# limits:
Expand Down Expand Up @@ -361,7 +364,7 @@ enforcer:
# memory: 2280Mi
internal: # this is used for internal communication. Please use the SAME CA for all the components (controller, scanner, adapter and enforcer)
certificate:
secret: ""
secret: ""
keyFile: tls.key
pemFile: tls.crt
caFile: ca.crt # must be the same CA for all internal.
Expand All @@ -385,7 +388,7 @@ manager:
svc:
mgrServerPort: 8443
type: ClusterIP
nodePort:
nodePort:
loadBalancerIP:
annotations:
{}
Expand Down Expand Up @@ -545,7 +548,7 @@ cve:
secretName: # my-tls-secret
internal: # this is used for internal communication. Please use the SAME CA for all the components (controller, scanner, adapter and enforcer)
certificate:
secret: ""
secret: ""
keyFile: tls.key
pemFile: tls.crt
caFile: ca.crt # must be the same CA for all internal.
Expand Down Expand Up @@ -615,11 +618,11 @@ cve:
runAsUser: # MUST be set for Rancher hardened cluster
internal: # this is used for internal communication. Please use the SAME CA for all the components (controller, scanner, adapter and enforcer)
certificate:
secret: ""
secret: ""
keyFile: tls.key
pemFile: tls.crt
caFile: ca.crt # must be the same CA for all internal.
volumes:
volumes:
volumeMounts:
resources:
{}
Expand Down