Skip to content

Commit 03292b0

Browse files
authored
fix(rel): PG images add SHA for image tag (#594)
Even with the version, `sg ops` won't replace the sha tag if none is present. ### Checklist - [x] Follow the [manual testing process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md) - [x] Update [changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md) - [x] Update [Kubernetes update doc](https://docs.sourcegraph.com/admin/updates/kubernetes) ### Test plan CI and local testing
1 parent fe9846b commit 03292b0

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

charts/sourcegraph/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ In addition to the documented values, all services also support the following va
6161
| codeInsightsDB.enabled | bool | `true` | Enable `codeinsights-db` PostgreSQL server |
6262
| codeInsightsDB.env | object | `{}` | Environment variables for the `codeinsights-db` container |
6363
| codeInsightsDB.existingConfig | string | `""` | Name of existing ConfigMap for `codeinsights-db`. It must contain a `postgresql.conf` key. |
64-
| codeInsightsDB.image.defaultTag | string | `"5.10.1164"` | Docker image tag for the `codeinsights-db` image |
64+
| codeInsightsDB.image.defaultTag | string | `"5.10.1164@sha256:e0f2818ce95cfb1e236feedfdcc2061f97d3d8333b74d8a5b0f1d9430d31ede6"` | Docker image tag for the `codeinsights-db` image |
6565
| codeInsightsDB.image.name | string | `"postgresql-16-codeinsights"` | Docker image name for the `codeinsights-db` image |
6666
| codeInsightsDB.init.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":70,"runAsUser":70}` | Security context for the `alpine` initContainer, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
6767
| codeInsightsDB.name | string | `"codeinsights-db"` | Name used by resources. Does not affect service names or PVCs. |
@@ -81,7 +81,7 @@ In addition to the documented values, all services also support the following va
8181
| codeIntelDB.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":999,"runAsUser":999}` | Security context for the `codeintel-db` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
8282
| codeIntelDB.enabled | bool | `true` | Enable `codeintel-db` PostgreSQL server |
8383
| codeIntelDB.existingConfig | string | `""` | Name of existing ConfigMap for `codeintel-db`. It must contain a `postgresql.conf` key |
84-
| codeIntelDB.image.defaultTag | string | `"5.10.1164"` | Docker image tag for the `codeintel-db` image |
84+
| codeIntelDB.image.defaultTag | string | `"5.10.1164@sha256:3a921369f241fec32659e7e31c31e0d1433d5887894a69e94de6ca3d257f650f"` | Docker image tag for the `codeintel-db` image |
8585
| codeIntelDB.image.name | string | `"postgresql-16"` | Docker image name for the `codeintel-db` image |
8686
| codeIntelDB.name | string | `"codeintel-db"` | Name used by resources. Does not affect service names or PVCs. |
8787
| codeIntelDB.podSecurityContext | object | `{"fsGroup":999,"fsGroupChangePolicy":"OnRootMismatch","runAsUser":999}` | Security context for the `codeintel-db` pod, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |
@@ -223,7 +223,7 @@ In addition to the documented values, all services also support the following va
223223
| pgsql.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":999,"runAsUser":999}` | Security context for the `pgsql` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
224224
| pgsql.enabled | bool | `true` | Enable `pgsql` PostgreSQL server |
225225
| pgsql.existingConfig | string | `""` | Name of existing ConfigMap for `pgsql`. It must contain a `postgresql.conf` key |
226-
| pgsql.image.defaultTag | string | `"5.10.1164"` | Docker image tag for the `pgsql` image |
226+
| pgsql.image.defaultTag | string | `"5.10.1164@sha256:3a921369f241fec32659e7e31c31e0d1433d5887894a69e94de6ca3d257f650f"` | Docker image tag for the `pgsql` image |
227227
| pgsql.image.name | string | `"postgresql-16"` | Docker image name for the `pgsql` image |
228228
| pgsql.name | string | `"pgsql"` | Name used by resources. Does not affect service names or PVCs. |
229229
| pgsql.podSecurityContext | object | `{"fsGroup":999,"fsGroupChangePolicy":"OnRootMismatch","runAsGroup":999,"runAsUser":999}` | Security context for the `pgsql` pod, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |

charts/sourcegraph/values.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ codeInsightsDB:
174174
additionalConfig: ""
175175
image:
176176
# -- Docker image tag for the `codeinsights-db` image
177-
defaultTag: 5.10.1164
177+
defaultTag: 5.10.1164@sha256:e0f2818ce95cfb1e236feedfdcc2061f97d3d8333b74d8a5b0f1d9430d31ede6
178178
# -- Docker image name for the `codeinsights-db` image
179179
name: "postgresql-16-codeinsights"
180180
# -- Security context for the `codeinsights-db` container,
@@ -245,7 +245,7 @@ codeIntelDB:
245245
additionalConfig: ""
246246
image:
247247
# -- Docker image tag for the `codeintel-db` image
248-
defaultTag: 5.10.1164
248+
defaultTag: 5.10.1164@sha256:3a921369f241fec32659e7e31c31e0d1433d5887894a69e94de6ca3d257f650f
249249
# -- Docker image name for the `codeintel-db` image
250250
name: "postgresql-16"
251251
# -- Security context for the `codeintel-db` container,
@@ -729,7 +729,7 @@ pgsql:
729729
additionalConfig: ""
730730
image:
731731
# -- Docker image tag for the `pgsql` image
732-
defaultTag: 5.10.1164
732+
defaultTag: 5.10.1164@sha256:3a921369f241fec32659e7e31c31e0d1433d5887894a69e94de6ca3d257f650f
733733
# -- Docker image name for the `pgsql` image
734734
name: "postgresql-16"
735735
# -- Security context for the `pgsql` container,
@@ -823,7 +823,6 @@ syntacticCodeIntel:
823823
# -- Name of the ServiceAccount to be created or an existing ServiceAccount
824824
name: ""
825825

826-
827826
preciseCodeIntel:
828827
# -- Environment variables for the `precise-code-intel-worker` container
829828
env:
@@ -1221,7 +1220,14 @@ jaeger:
12211220
# -- Name used by resources. Does not affect service names or PVCs.
12221221
name: "jaeger"
12231222
# -- Default args passed to the `jaeger` binary
1224-
args: [ "--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled", "--collector.otlp.grpc.host-port=:4320", "--collector.otlp.http.host-port=:4321" ]
1223+
args:
1224+
[
1225+
"--memory.max-traces=20000",
1226+
"--sampling.strategies-file=/etc/jaeger/sampling_strategies.json",
1227+
"--collector.otlp.enabled",
1228+
"--collector.otlp.grpc.host-port=:4320",
1229+
"--collector.otlp.http.host-port=:4321",
1230+
]
12251231
# -- Security context for the `jaeger` container,
12261232
# learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container)
12271233
containerSecurityContext:
@@ -1288,7 +1294,8 @@ worker:
12881294
# -- Scale worker horizontally by configuring additional replicas dedicated to specific jobs.
12891295
# for each replica, configure the dedicated jobs to run on this replica.
12901296
# learn more from https://sourcegraph.com/docs/admin/workers#3-split-jobs-and-scale-independently
1291-
replicas: []
1297+
replicas:
1298+
[]
12921299
# - jobs: []
12931300
# resources:
12941301
# limits:
@@ -1297,7 +1304,7 @@ worker:
12971304
# requests:
12981305
# cpu: 500m
12991306
# memory: 2G
1300-
1307+
13011308
# -- Resource requests & limits for the `worker` container,
13021309
# learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
13031310
resources:

0 commit comments

Comments
 (0)