Use new registry (#482)

giantswarm · Jan 23, 2024 · 15a53ee · 15a53ee
1 parent a294ac4
commit 15a53ee
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Use `gsoci.azurecr.io` for `kubeadm` container images.
+- Use `gsoci.azurecr.io` for sandbox container image (pause container).
+- Update `coredns` to `1.21.0` to use `gsoci.azurecr.io`.
+- Update `aws-cloud-controller-manager` to `1.25.14-gs2` to use `gsoci.azurecr.io`.
+
 ## [0.58.0] - 2024-01-22
 
 ### Changed

diff --git a/helm/cluster-aws/README.md b/helm/cluster-aws/README.md
@@ -214,7 +214,7 @@ For Giant Swarm internal use only, not stable, or not supported by UIs.
 | `internal.nodePools.PATTERN.subnetTags[*].*` | **Tag value**|**Type:** `string`<br/>**Key pattern:**<br/>`PATTERN`=`^[a-z0-9][-a-z0-9]{3,18}[a-z0-9]$`<br/>**Value pattern:** `^[ a-zA-Z0-9\._:/=+-@]+$`<br/>|
 | `internal.sandboxContainerImage` | **Sandbox image** - The image used by sandbox / pause container|**Type:** `object`<br/>|
 | `internal.sandboxContainerImage.name` | **Repository**|**Type:** `string`<br/>**Default:** `"giantswarm/pause"`|
-| `internal.sandboxContainerImage.registry` | **Registry**|**Type:** `string`<br/>**Default:** `"quay.io"`|
+| `internal.sandboxContainerImage.registry` | **Registry**|**Type:** `string`<br/>**Default:** `"gsoci.azurecr.io"`|
 | `internal.sandboxContainerImage.tag` | **Tag**|**Type:** `string`<br/>**Default:** `"3.9"`|
 | `internal.teleport` | **Teleport**|**Type:** `object`<br/>|
 | `internal.teleport.enabled` | **Enable teleport**|**Type:** `boolean`<br/>**Default:** `true`|
@@ -227,7 +227,7 @@ Properties within the `.kubectlImage` top-level object
 | **Property** | **Description** | **More Details** |
 | :----------- | :-------------- | :--------------- |
 | `kubectlImage.name` | **Repository**|**Type:** `string`<br/>**Default:** `"giantswarm/kubectl"`|
-| `kubectlImage.registry` | **Registry**|**Type:** `string`<br/>**Default:** `"quay.io"`|
+| `kubectlImage.registry` | **Registry**|**Type:** `string`<br/>**Default:** `"gsoci.azurecr.io"`|
 | `kubectlImage.tag` | **Tag**|**Type:** `string`<br/>**Default:** `"1.23.5"`|
 
 ### Metadata

diff --git a/helm/cluster-aws/templates/_control_plane.tpl b/helm/cluster-aws/templates/_control_plane.tpl
@@ -87,7 +87,7 @@ spec:
             {{- include "nodeDirectories" $ | nindent 14 }}
     clusterConfiguration:
       # Avoid accessibility issues (e.g. on private clusters) and potential future rate limits for the default `registry.k8s.io`
-      imageRepository: docker.io/giantswarm
+      imageRepository: gsoci.azurecr.io/giantswarm
 
       apiServer:
         timeoutForControlPlane: 20m

diff --git a/helm/cluster-aws/templates/cloud-provider-aws-helmrelease.yaml b/helm/cluster-aws/templates/cloud-provider-aws-helmrelease.yaml
@@ -28,7 +28,7 @@ spec:
       chart: aws-cloud-controller-manager-app
       # used by renovate
       # repo: giantswarm/aws-cloud-controller-manager-app
-      version: v1.24.1-gs8
+      version: v1.25.14-gs2
       sourceRef:
         kind: HelmRepository
         name: {{ include "resource.default.name" $ }}-default

diff --git a/helm/cluster-aws/templates/coredns-helmrelease.yaml b/helm/cluster-aws/templates/coredns-helmrelease.yaml
@@ -28,7 +28,7 @@ spec:
       chart: coredns-app
       # used by renovate
       # repo: giantswarm/coredns-app
-      version: 1.20.0
+      version: 1.21.0
       sourceRef:
         kind: HelmRepository
         name: {{ include "resource.default.name" $ }}-default

diff --git a/helm/cluster-aws/values.schema.json b/helm/cluster-aws/values.schema.json
@@ -1056,7 +1056,7 @@
                         "registry": {
                             "type": "string",
                             "title": "Registry",
-                            "default": "quay.io"
+                            "default": "gsoci.azurecr.io"
                         },
                         "tag": {
                             "type": "string",
@@ -1100,7 +1100,7 @@
                 "registry": {
                     "type": "string",
                     "title": "Registry",
-                    "default": "quay.io"
+                    "default": "gsoci.azurecr.io"
                 },
                 "tag": {
                     "type": "string",

diff --git a/helm/cluster-aws/values.yaml b/helm/cluster-aws/values.yaml
@@ -105,13 +105,13 @@ internal:
       minSize: 3
   sandboxContainerImage:
     name: giantswarm/pause
-    registry: quay.io
+    registry: gsoci.azurecr.io
     tag: "3.9"
   teleport:
     enabled: true
     proxyAddr: teleport.giantswarm.io:443
     version: 14.1.3
 kubectlImage:
   name: giantswarm/kubectl
-  registry: quay.io
+  registry: gsoci.azurecr.io
   tag: 1.23.5