8201f94b by Adam Heath

Have registry use redis.

1 parent a87b1c0c
...@@ -14,8 +14,16 @@ environments: ...@@ -14,8 +14,16 @@ environments:
14 images: 14 images:
15 debian: "debian:bullseye-20211220" 15 debian: "debian:bullseye-20211220"
16 registry: "registry:2" 16 registry: "registry:2"
17 17 redis: "redis:6.2.6"
18 --- 18 ---
19 helmfiles:
20 - path: ../redis/helmfile.yaml
21 values:
22 - namespace: {{ .Values.namespace }}
23 namePrefix: {{ .Values.namePrefix }}registry-
24 images:
25 redis: {{ .Values.images.redis }}
26
19 releases: 27 releases:
20 28
21 - name: {{ .Values.namePrefix }}registry 29 - name: {{ .Values.namePrefix }}registry
...@@ -58,18 +66,21 @@ releases: ...@@ -58,18 +66,21 @@ releases:
58 - name: registry-data 66 - name: registry-data
59 persistentVolumeClaim: 67 persistentVolumeClaim:
60 claimName: {{ .Values.namePrefix }}registry-data 68 claimName: {{ .Values.namePrefix }}registry-data
61 - name: registry-config 69 containers:
62 configMap: 70 - name: registry
71 envFrom:
72 - configMapRef:
63 name: {{ .Values.namePrefix }}registry-config 73 name: {{ .Values.namePrefix }}registry-config
64 - name: registry-secret 74 - secretRef:
65 secret: 75 name: {{ .Values.namePrefix }}registry-secret
66 secretName: {{ .Values.namePrefix }}registry-secret
67 - apiVersion: v1 76 - apiVersion: v1
68 kind: ConfigMap 77 kind: ConfigMap
69 metadata: 78 metadata:
70 name: {{ .Values.namePrefix }}registry-config 79 name: {{ .Values.namePrefix }}registry-config
71 namespace: {{ .Values.namespace }} 80 namespace: {{ .Values.namespace }}
72 data: 81 data:
82 REGISTRY_REDIS_ADDR: {{ .Values.namePrefix }}registry-redis.{{ .Values.namespace }}.svc.cluster.local
83 REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR: redis
73 - apiVersion: v1 84 - apiVersion: v1
74 kind: Secret 85 kind: Secret
75 metadata: 86 metadata:
......
...@@ -38,16 +38,15 @@ spec: ...@@ -38,16 +38,15 @@ spec:
38 - name: registry-data 38 - name: registry-data
39 persistentVolumeClaim: 39 persistentVolumeClaim:
40 claimName: registry-data 40 claimName: registry-data
41 - name: registry-config
42 configMap:
43 name: registry-config
44 - name: registry-secret
45 secret:
46 secretName: registry-secret
47 41
48 containers: 42 containers:
49 - name: registry 43 - name: registry
50 image: registry:2 44 image: registry:2
45 envFrom:
46 - configMapRef:
47 name: registry-config
48 - secretRef:
49 name: registry-secret
51 volumeMounts: 50 volumeMounts:
52 - name: registry-data 51 - name: registry-data
53 mountPath: /var/lib/registry 52 mountPath: /var/lib/registry
......