Skip to content

Commit 909dee0

Browse files
add digests for all private OpsLevel images to harden supply chain
1 parent 5c3dcea commit 909dee0

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

charts/opslevel/templates/_helpers.tpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,31 @@ https://github.com/apps/{{ required "please provide 'integrations.github.secret.
5252
{{- end }}
5353

5454
{{- define "opslevel.image" -}}
55-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.opslevel.image.repository }}:{{ .Values.opslevel.image.tag }}
55+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.opslevel.image.repository }}:{{ .Values.opslevel.image.tag }}{{- if .Values.opslevel.image.digest }}@{{ .Values.opslevel.image.digest }}{{- end }}
5656
{{- end }}
5757

5858
{{- define "opssight.image" -}}
59-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.opssight.image.repository }}:{{ .Values.opssight.image.tag }}
59+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.opssight.image.repository }}:{{ .Values.opssight.image.tag }}{{- if .Values.opssight.image.digest }}@{{ .Values.opssight.image.digest }}{{- end }}
6060
{{- end }}
6161

6262
{{- define "mysql.image" -}}
63-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.mysql.image.repository }}:{{ .Values.mysql.image.tag }}
63+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.mysql.image.repository }}:{{ .Values.mysql.image.tag }}{{- if .Values.mysql.image.digest }}@{{ .Values.mysql.image.digest }}{{- end }}
6464
{{- end }}
6565

6666
{{- define "redis.image" -}}
67-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
67+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}{{- if .Values.redis.image.digest }}@{{ .Values.redis.image.digest }}{{- end }}
6868
{{- end }}
6969

7070
{{- define "postgres.image" -}}
71-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}
71+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}{{- if .Values.postgres.image.digest }}@{{ .Values.postgres.image.digest }}{{- end }}
7272
{{- end }}
7373

7474
{{- define "elasticsearch.image" -}}
75-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}
75+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}{{- if .Values.elasticsearch.image.digest }}@{{ .Values.elasticsearch.image.digest }}{{- end }}
7676
{{- end }}
7777

7878
{{- define "objectStorage.image" -}}
79-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.objectStorage.image.repository }}:{{ .Values.objectStorage.image.tag }}
79+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.objectStorage.image.repository }}:{{ .Values.objectStorage.image.tag }}{{- if .Values.objectStorage.image.digest }}@{{ .Values.objectStorage.image.digest }}{{- end }}
8080
{{- end }}
8181

8282
{{- define "objectStorageCLI.image" -}}
@@ -88,7 +88,7 @@ https://github.com/apps/{{ required "please provide 'integrations.github.secret.
8888
{{- end }}
8989

9090
{{- define "faktory.image" -}}
91-
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.faktory.image.repository }}:{{ .Values.faktory.image.tag }}
91+
{{ .Values.global.proxy }}{{if .Values.global.proxy }}/{{ end }}{{ .Values.faktory.image.repository }}:{{ .Values.faktory.image.tag }}{{- if .Values.faktory.image.digest }}@{{ .Values.faktory.image.digest }}{{- end }}
9292
{{- end }}
9393

9494
{{- define "faktory.url" -}}

charts/opslevel/values.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ opslevel:
4040
image:
4141
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/opslevel"
4242
tag: "selfhosted-prod-df09c051-1770400830"
43+
digest: "sha256:38f321a345bd780a94dc87647a13fd7fecae1cda29cfa5b8bc6a197ed39fff42"
4344
account:
4445
name: "Main"
4546
username: "Alice Wonderland"
@@ -125,6 +126,7 @@ opssight:
125126
image:
126127
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/opssight"
127128
tag: "selfhosted-production-c8726ff-1770403220"
129+
digest: "sha256:8a3f5530957257530785304155bb769d6ee22e8378d674e8f806b93a79f84764"
128130
pod:
129131
annotations: {}
130132
web:
@@ -144,6 +146,7 @@ mysql:
144146
image:
145147
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/mysql"
146148
tag: "8.0.34-debian"
149+
digest: "sha256:be872f0d857262b512e094dd399ff7abd02cb93a73d0df1317decd1ea23b9391"
147150
resources: *resourcesMedium
148151
pod:
149152
annotations: {}
@@ -168,6 +171,7 @@ postgres:
168171
image:
169172
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/postgres"
170173
tag: "16.1-bookworm"
174+
digest: "sha256:6984ec6ca4fa95a2728bd2036b6536f5092b327fcc18e052e321fd7e12308b23"
171175
resources: *resourcesMedium
172176
pod:
173177
annotations: {}
@@ -193,6 +197,7 @@ redis:
193197
image:
194198
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/redis"
195199
tag: "6.2.6"
200+
digest: "sha256:226cbafc637cd58cf008bf87ec9d1548ad1b672ef4279433495bdff100cdb883"
196201
resources: *resourcesMedium
197202
pod:
198203
annotations: {}
@@ -232,6 +237,7 @@ elasticsearch:
232237
image:
233238
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/elasticsearch"
234239
tag: "8.17.3"
240+
digest: "sha256:b5b1b63e263e5ebbbe9dc168ff3ce3024f28578f493e5571a3f008eae52940a9"
235241
resources: *resourcesLarge
236242
pod:
237243
annotations: {}
@@ -257,6 +263,7 @@ objectStorage:
257263
image:
258264
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/minio"
259265
tag: "RELEASE.2022-08-22T23-53-06Z"
266+
digest: "sha256:255ead3d1a52c268e4a97428a827e9c50912ec2a03970432f9d6bcc5d69066df"
260267
repositoryCLI: "minio/mc"
261268
tagCLI: "RELEASE.2023-02-28T00-12-59Z"
262269
resources: *resourcesMedium
@@ -281,6 +288,7 @@ faktory:
281288
image:
282289
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/faktory"
283290
tag: "1.9.1"
291+
digest: "sha256:0139f895e97aa961b4e7dce3050e768c352e4a67c14c64e67ade4ca0bb71790a"
284292
resources: *resourcesMedium
285293
securityContext: {}
286294
storageClass: ""

0 commit comments

Comments
 (0)