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(base-cluster/kube-janitor): enable artifacthub-values and correctly prefix docker.io registry #1048

Merged
merged 2 commits into from
Jul 24, 2024
Merged

fix(base-cluster/kube-janitor): enable artifacthub-values and correctly prefix docker.io registry #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb7f58f
fix(base-cluster/kube-janitor): enable artifacthub-values and correctly
cwrau Jul 24, 2024
2692876
chore(base-cluster/kube-janitor): trust kube-janitor image
cwrau Jul 24, 2024
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
2 changes: 2 additions & 0 deletions .github/trusted_registries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ registries:
curl: ALL_TAGS
fluxcd: ALL_IMAGES
grafana: ALL_IMAGES
hjacobs:
kube-janitor: ALL_TAGS
stellio: ALL_IMAGES
velero: ALL_IMAGES
vladgh:
Expand Down
2 changes: 2 additions & 0 deletions charts/base-cluster/ci/artifacthub-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ monitoring:
pagerduty:
enabled: true
integrationKey: INTEGRATION_KEY
kube-janitor:
enabled: true
13 changes: 4 additions & 9 deletions charts/base-cluster/templates/global/kube-janitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,11 @@ spec:
mode: enabled
values:
priorityClassName: cluster-components
{{- $image := dict -}}
{{- if .Values.global.imageRegistry -}}
{{- $image = set $image "repository" (printf "%s/hjacobs/kube-janitor" $.Values.global.imageRegistry) -}}
{{- end }}
{{- with dig "kube-janitor" "charts" "kube-janitor" "tag" "" .Values.global.helmRepositories -}}
{{- $image = set $image "tag" . -}}
{{- end }}
{{- with $image }}
image: {{- toYaml $image | nindent 6 }}
{{- $image := dict "repository" (printf "%s/hjacobs/kube-janitor" ($.Values.global.imageRegistry | default (include "base-cluster.defaultRegistry" (dict)))) -}}
{{- with dig "kube-janitor" "charts" "kube-janitor" "tag" "" .Values.global.helmRepositories -}}
{{- $image = set $image "tag" . -}}
{{- end }}
image: {{- toYaml $image | nindent 6 }}
resources:
limits:
memory: 1Gi
Expand Down