clickhouse-system: use canonical upstream image names (#436)
rke2's `registries.yaml` already rewrites upstream image names to the artifactapi mirror, so manifests must carry canonical upstream names. Only in-house `artifactapi.k8s.syd1.au.unkin.net/docker-internal/...` images stay explicit. Changes: - Point the Altinity chart crdHook at `docker.io/bitnami/kubectl`. - Point the operator at `docker.io/altinity/clickhouse-operator`. - Point the metrics exporter at `docker.io/altinity/metrics-exporter`. - Reword the header comment that claimed all images are pulled through the artifactapi dockerhub remote. Only the `repository` keys change; the chart still supplies the tags (0.27.2 / latest), so rendered tags are identical. `kustomize build --enable-helm apps/overlays/au-syd1/clickhouse-system` differs from main only in those three image strings. No other proxied refs in the file. Reviewed-on: #436 Co-authored-by: unkin-agent <unkin-agent@unkin.net> Co-committed-by: unkin-agent <unkin-agent@unkin.net>
This commit was merged in pull request #436.
This commit is contained in:
@@ -2,10 +2,9 @@
|
|||||||
# resources in all namespaces (the logs cluster lives in the `logging` namespace).
|
# resources in all namespaces (the logs cluster lives in the `logging` namespace).
|
||||||
# CRDs are installed at runtime by the chart's crdHook Job.
|
# CRDs are installed at runtime by the chart's crdHook Job.
|
||||||
#
|
#
|
||||||
# All images are pulled through the artifactapi dockerhub remote (no direct
|
# Upstream official images; no Docker Hardened Image variant is adopted (DHI is
|
||||||
# upstream). Upstream official images are used; no Docker Hardened Image variant
|
# subscription-gated and served from a private org namespace not reachable via
|
||||||
# is adopted (DHI is subscription-gated and served from a private org namespace
|
# the anonymous artifactapi dockerhub proxy).
|
||||||
# not reachable via the anonymous artifactapi dockerhub proxy).
|
|
||||||
#
|
#
|
||||||
# Watch the logging namespace where the ClickHouseInstallation lives. The chart
|
# Watch the logging namespace where the ClickHouseInstallation lives. The chart
|
||||||
# default (watchNamespaces: []) makes the operator watch ONLY its own namespace
|
# default (watchNamespaces: []) makes the operator watch ONLY its own namespace
|
||||||
@@ -14,7 +13,7 @@ watchNamespaces:
|
|||||||
- logging
|
- logging
|
||||||
crdHook:
|
crdHook:
|
||||||
image:
|
image:
|
||||||
repository: artifactapi.k8s.syd1.au.unkin.net/dockerhub/bitnami/kubectl
|
repository: docker.io/bitnami/kubectl
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 50m
|
cpu: 50m
|
||||||
@@ -25,7 +24,7 @@ crdHook:
|
|||||||
|
|
||||||
operator:
|
operator:
|
||||||
image:
|
image:
|
||||||
repository: artifactapi.k8s.syd1.au.unkin.net/dockerhub/altinity/clickhouse-operator
|
repository: docker.io/altinity/clickhouse-operator
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
@@ -36,7 +35,7 @@ operator:
|
|||||||
|
|
||||||
metrics:
|
metrics:
|
||||||
image:
|
image:
|
||||||
repository: artifactapi.k8s.syd1.au.unkin.net/dockerhub/altinity/metrics-exporter
|
repository: docker.io/altinity/metrics-exporter
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 50m
|
cpu: 50m
|
||||||
|
|||||||
Reference in New Issue
Block a user