Skip to content

config(helm) - allow setting config path to garbagecollector #506

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

config(helm) - allow setting config path to garbagecollector #506

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
2 changes: 1 addition & 1 deletion helm/kube-image-keeper/templates/garbage-collection-cron-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
sleep 1
done

kubectl exec deploy/{{ include "kube-image-keeper.fullname" . }}-registry -- bin/registry garbage-collect /etc/docker/registry/config.yml --delete-untagged={{ .Values.registry.garbageCollection.deleteUntagged }}
kubectl exec deploy/{{ include "kube-image-keeper.fullname" . }}-registry -- bin/registry garbage-collect {{ .Values.registry.garbageCollection.registryConfig }} --delete-untagged={{ .Values.registry.garbageCollection.deleteUntagged }}
kubectl set env deploy {{ include "kube-image-keeper.fullname" . }}-registry REGISTRY_STORAGE_MAINTENANCE_READONLY-
{{- else }}
kubectl rollout restart sts {{ include "kube-image-keeper.fullname" . }}-registry
Expand Down
25 changes: 6 additions & 19 deletions helm/kube-image-keeper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ registry:
pullPolicy: IfNotPresent
# -- Cronjob image tag. Default 'latest'
tag: "latest"
registryConfig: "/etc/docker/registry/config.yml"
service:
# -- Registry service type
type: ClusterIP
Expand Down Expand Up @@ -324,7 +325,7 @@ registry:
# -- Maximum unavailable pods
maxUnavailable: ""
serviceMonitor:
# -- Should a ServiceMonitor object be installed to scrape kuik registry metrics. For prometheus-operator (kube-prometheus) users.
# -- Should a ServiceMonitor object be installed to scrape kuik registry metrics. For prometheus-operator (kube-prometheus) users.
create: false
# -- Target scrape interval set in the ServiceMonitor
scrapeInterval: 60s
Expand All @@ -335,14 +336,8 @@ registry:
# -- Relabel config for the ServiceMonitor, see: https://coreos.com/operators/prometheus/docs/latest/api.html#relabelconfig
relabelings: []
serviceAccount:
# -- Create the registry serviceAccount. If false, use serviceAccount with specified name (or "default" if false and name unset.)
create: true
# -- Name of the registry serviceAccount (auto-generated if unset and create is true)
name: ""
# -- Annotations to add to the registry serviceAccount
# -- Annotations to add to the servicateAccount
annotations: {}
# -- Additional labels to add to the registry serviceAccount
extraLabels: {}

docker-registry-ui:
# -- If true, enable the registry user interface
Expand Down Expand Up @@ -378,19 +373,11 @@ minio:
--secret-key "$(cat /opt/bitnami/minio/svcacct/registry/secretKey)"
provisioning registry) > /dev/null

rbac:
# -- Create the ClusterRole and ClusterRoleBinding. If false, need to associate permissions with serviceAccount outside this Helm chart.
create: true

serviceAccount:
# -- Create the serviceAccount. If false, use serviceAccount with specified name (or "default" if false and name unset.)
create: true
# -- Name of the serviceAccount (auto-generated if unset and create is true)
name: ""
# -- Annotations to add to the serviceAccount
# -- Annotations to add to the servicateAccount
annotations: {}
# -- Additional labels to add to the serviceAccount
extraLabels: {}
# -- Name of the serviceAccount
name: ""

psp:
# -- If True, create the PodSecurityPolicy
Expand Down