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.

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

fix: disable maester by default #687

Merged
merged 1 commit into from
Aug 22, 2024
Merged

fix: disable maester by default #687

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
1 change: 1 addition & 0 deletions hacks/values/oathkeeper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ deployment:
maxSurge: 25%
maxUnavailable: 25%
oathkeeper:
managedAccessRules: true
accessRules: |
[
{
Expand Down
19 changes: 18 additions & 1 deletion helm/charts/oathkeeper/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ If release name contains chart name it will be used as a full name.
{{- end -}}
{{- end -}}


{{/*
Create a config map name for rules.
If maester is enabled, use the child chart named template to get the value.
*/}}
{{- define "oathkeeper.rulesConfigMapName" -}}
{{- if .Values.maester.enabled -}}
{{- $childChart := (dict "Name" "oathkeeper-maester") -}}
{{- include "oathkeeper-maester.getCM" (dict "Values" (index .Values "oathkeeper-maester") "Release" $.Release "Chart" $childChart) }}
{{- else -}}
{{ include "oathkeeper.fullname" . }}-rules
{{- end -}}
{{- end -}}


{{/*
Create a secret name which can be overridden.
*/}}
Expand Down Expand Up @@ -86,9 +101,11 @@ Checksum annotations generated from configmaps and secrets
{{- if .Values.configmap.hashSumEnabled }}
{{- $oathkeeperConfigMapFile := ternary "/configmap-config-demo.yaml" "/configmap-config.yaml" (.Values.demo) }}
checksum/oathkeeper-config: {{ include (print $.Template.BasePath $oathkeeperConfigMapFile) . | sha256sum }}
{{- if .Values.oathkeeper.managedAccessRules }}
checksum/oathkeeper-rules: {{ include (print $.Template.BasePath "/configmap-rules.yaml") . | sha256sum }}
{{- end }}
{{- end }}
{{- if and .Values.secret.enabled .Values.secret.hashSumEnabled }}
checksum/oauthkeeper-secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions helm/charts/oathkeeper/templates/configmap-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{{- if .Values.oathkeeper.managedAccessRules }}
{{- if .Values.maester.enabled -}}
{{- fail "Both `managedAccessRules` and `maester.enabled` cannot be set to true at the same time" }}
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
Expand Down
6 changes: 3 additions & 3 deletions helm/charts/oathkeeper/templates/deployment-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ spec:
name: {{ include "oathkeeper.fullname" . }}-config
{{- end }}
- name: {{ include "oathkeeper.name" . }}-rules-volume
{{- if .Values.oathkeeper.managedAccessRules }}
{{- if or .Values.oathkeeper.managedAccessRules .Values.maester.enabled }}
configMap:
name: {{ include "oathkeeper.fullname" . }}-rules
name: {{ include "oathkeeper.rulesConfigMapName" . }}
{{- else }}
emptyDir: {}
{{- end }}
Expand All @@ -76,7 +76,7 @@ spec:
serviceAccountName: {{ include "oathkeeper.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.deployment.automountServiceAccountToken }}
initContainers:
{{- if (not .Values.oathkeeper.managedAccessRules) }}
{{- if and (not .Values.oathkeeper.managedAccessRules) (not .Values.maester.enabled) }}
- name: init
image: "{{ .Values.image.initContainer.repository }}:{{ .Values.image.initContainer.tag }}"
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/oathkeeper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ affinity: {}

## -- Configures controller setup
maester:
enabled: true
enabled: false

## -- PodDistributionBudget configuration
pdb:
Expand Down
Loading