davad/argo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(docker-registry): configmap suffix wasn't being applied because of namespace shennanigans

Browse source
This commit is contained in:
David Landry 2024-10-16 16:09:59 -04:00
parent 2d33f4b575
commit c9a2ebe213
3 changed files with 23 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/docker-registry/base/cronjob.yaml
View file

@ -4,7 +4,6 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: docker-registry-garbage-collector
namespace: gitops
labels:
app: docker-registry
chart: docker-registry-2.2.3
@ -23,7 +22,7 @@ spec:
spec:
template:
spec:
securityContext:
securityContext:
fsGroup: 1000
runAsUser: 1000
containers:
@ -31,11 +30,11 @@ spec:
image: "registry:2.8.1"
imagePullPolicy: IfNotPresent
command:
- /bin/registry
- garbage-collect
- --delete-untagged=true
- /etc/docker/registry/config.yml
env:
- /bin/registry
- garbage-collect
- --delete-untagged=true
- /etc/docker/registry/config.yml
env:
- name: REGISTRY_HTTP_SECRET
valueFrom:
secretKeyRef:
@ -61,7 +60,7 @@ spec:
secretKeyRef:
name: docker-registry-secret
key: proxyPassword
volumeMounts:
volumeMounts:
- name: config
mountPath: "/etc/docker/registry"
- name: auth
@ -70,7 +69,7 @@ spec:
- name: data
mountPath: /var/lib/registry/
restartPolicy: OnFailure
volumes:
volumes:
- name: config
configMap:
name: docker-registry-config
@ -78,8 +77,7 @@ spec:
secret:
secretName: docker-registry-secret
items:
- key: htpasswd
path: htpasswd
- key: htpasswd
path: htpasswd
- name: data
emptyDir: {}

40
apps/docker-registry/base/deployment.yaml
View file

@ -4,33 +4,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: docker-registry
namespace: gitops
labels:
app: docker-registry
chart: docker-registry-2.2.3
release: docker-registry
heritage: Helm
app.kubernetes.io/name: docker-registry
spec:
selector:
matchLabels:
app: docker-registry
release: docker-registry
app.kubernetes.io/name: docker-registry
replicas: 1
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 0
revisionHistoryLimit: 3
strategy:
type: RollingUpdate
minReadySeconds: 5
template:
metadata:
labels:
app: docker-registry
release: docker-registry
app.kubernetes.io/name: docker-registry
annotations:
updated-at/secret: 2024-10-16T14:38:25-04:00
spec:
securityContext:
securityContext:
fsGroup: 1000
runAsUser: 1000
containers:
@ -38,9 +28,9 @@ spec:
image: "registry:2.8.1"
imagePullPolicy: IfNotPresent
command:
- /bin/registry
- serve
- /etc/docker/registry/config.yml
- /bin/registry
- serve
- /etc/docker/registry/config.yml
ports:
- containerPort: 5000
livenessProbe:
@ -51,8 +41,7 @@ spec:
httpGet:
path: /
port: 5000
resources:
{}
resources: {}
env:
- name: REGISTRY_HTTP_SECRET
valueFrom:
@ -81,7 +70,7 @@ spec:
key: proxyPassword
volumeMounts:
- name: config
mountPath: "/etc/docker/registry"
mountPath: /etc/docker/registry
readOnly: true
- name: auth
mountPath: /auth
@ -92,15 +81,12 @@ spec:
- name: config
configMap:
name: docker-registry-config
items:
- key: "config.yml"
path: "config.yml"
- name: auth
secret:
secretName: docker-registry-secret
items:
- key: htpasswd
path: htpasswd
- key: htpasswd
path: htpasswd
- name: data
persistentVolumeClaim:
claimName: docker-registry