From 1e61748b6afd584a54aee7fb5f82c983ab8ce4ac Mon Sep 17 00:00:00 2001
From: Simon Weald <7832341+glitchcrab@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:02:07 +0000
Subject: [PATCH] Switch container registry to gsoci.azurecr.io (#262)
* Switch container registry to gsoci.azurecr.io
* update values schema
* update readme
* update image location for etcd
---
CHANGELOG.md | 4 ++++
helm/cluster-cloud-director/README.md | 6 +++---
helm/cluster-cloud-director/values.schema.json | 8 ++++----
helm/cluster-cloud-director/values.yaml | 6 +++---
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53b3286a..5a0b3470 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+### Changed
+
+- Switch container registry to `gsoci.azurecr.io`.
+
## [0.14.6] - 2024-02-19
### Fixed
diff --git a/helm/cluster-cloud-director/README.md b/helm/cluster-cloud-director/README.md
index 7119c564..d96ee82b 100644
--- a/helm/cluster-cloud-director/README.md
+++ b/helm/cluster-cloud-director/README.md
@@ -26,7 +26,7 @@ Properties within the `.internal` top-level object
| `internal.rdeId` | **Runtime defined entity (RDE) identifier** - This cluster's RDE ID in the VCD API.|**Type:** `string`
|
| `internal.sandboxContainerImage` | **Sandbox Container image (pause container)**|**Type:** `object`
|
| `internal.sandboxContainerImage.name` | **Repository**|**Type:** `string`
**Default:** `"giantswarm/pause"`|
-| `internal.sandboxContainerImage.registry` | **Registry**|**Type:** `string`
**Default:** `"quay.io"`|
+| `internal.sandboxContainerImage.registry` | **Registry**|**Type:** `string`
**Default:** `"gsoci.azurecr.io"`|
| `internal.sandboxContainerImage.tag` | **Tag**|**Type:** `string`
**Default:** `"3.9"`|
| `internal.skipRde` | **Skip RDE** - Set to true if the API schema extension is installed in the correct version in VCD to create CAPVCD entities in the API. Set to false otherwise.|**Type:** `boolean`
|
| `internal.useAsManagementCluster` | **Display as management cluster**|**Type:** `boolean`
**Default:** `false`|
@@ -99,7 +99,7 @@ Properties within the `.controlPlane` top-level object
| `controlPlane.dns.imageRepository` | **Repository**|**Type:** `string`
**Example:** `"projects.registry.vmware.com/tkg"`
**Default:** `"projects.registry.vmware.com/tkg"`|
| `controlPlane.dns.imageTag` | **Tag**|**Type:** `string`
**Example:** `"v1.7.0_vmware.12"`
**Default:** `"v1.7.0_vmware.12"`|
| `controlPlane.etcd` | **Etcd container image**|**Type:** `object`
|
-| `controlPlane.etcd.imageRepository` | **Repository**|**Type:** `string`
**Example:** `"giantswarm"`
**Default:** `"giantswarm"`|
+| `controlPlane.etcd.imageRepository` | **Repository**|**Type:** `string`
**Example:** `"gsoci.azurecr.io/giantswarm"`
**Default:** `"gsoci.azurecr.io/giantswarm"`|
| `controlPlane.etcd.imageTag` | **Tag**|**Type:** `string`
**Example:** `"3.5.4-0-k8s"`
**Default:** `"3.5.4-0-k8s"`|
| `controlPlane.image` | **Node container image**|**Type:** `object`
|
| `controlPlane.image.repository` | **Repository**|**Type:** `string`
**Example:** `"projects.registry.vmware.com/tkg"`
**Default:** `"projects.registry.vmware.com/tkg"`|
@@ -125,7 +125,7 @@ Used by cluster-shared library chart to configure coredns in-cluster.
| **Property** | **Description** | **More Details** |
| :----------- | :-------------- | :--------------- |
| `kubectlImage.name` | **Repository**|**Type:** `string`
**Default:** `"giantswarm/kubectl"`|
-| `kubectlImage.registry` | **Registry**|**Type:** `string`
**Default:** `"quay.io"`|
+| `kubectlImage.registry` | **Registry**|**Type:** `string`
**Default:** `"gsoci.azurecr.io"`|
| `kubectlImage.tag` | **Tag**|**Type:** `string`
**Default:** `"1.23.5"`|
### Metadata
diff --git a/helm/cluster-cloud-director/values.schema.json b/helm/cluster-cloud-director/values.schema.json
index beead903..78c99578 100644
--- a/helm/cluster-cloud-director/values.schema.json
+++ b/helm/cluster-cloud-director/values.schema.json
@@ -501,9 +501,9 @@
"type": "string",
"title": "Repository",
"examples": [
- "giantswarm"
+ "gsoci.azurecr.io/giantswarm"
],
- "default": "giantswarm"
+ "default": "gsoci.azurecr.io/giantswarm"
},
"imageTag": {
"type": "string",
@@ -723,7 +723,7 @@
"registry": {
"type": "string",
"title": "Registry",
- "default": "quay.io"
+ "default": "gsoci.azurecr.io"
},
"tag": {
"type": "string",
@@ -758,7 +758,7 @@
"registry": {
"type": "string",
"title": "Registry",
- "default": "quay.io"
+ "default": "gsoci.azurecr.io"
},
"tag": {
"type": "string",
diff --git a/helm/cluster-cloud-director/values.yaml b/helm/cluster-cloud-director/values.yaml
index 653fe717..f7ffc5a4 100644
--- a/helm/cluster-cloud-director/values.yaml
+++ b/helm/cluster-cloud-director/values.yaml
@@ -27,7 +27,7 @@ controlPlane:
imageRepository: projects.registry.vmware.com/tkg
imageTag: v1.7.0_vmware.12
etcd:
- imageRepository: giantswarm
+ imageRepository: gsoci.azurecr.io/giantswarm
imageTag: 3.5.4-0-k8s
image:
repository: projects.registry.vmware.com/tkg
@@ -57,12 +57,12 @@ internal:
featureGates: []
sandboxContainerImage:
name: giantswarm/pause
- registry: quay.io
+ registry: gsoci.azurecr.io
tag: "3.9"
useAsManagementCluster: false
kubectlImage:
name: giantswarm/kubectl
- registry: quay.io
+ registry: gsoci.azurecr.io
tag: 1.23.5
metadata:
preventDeletion: false