Browse Source

chore: updates default oci (#3903)

* chore: updates default oci

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

* fix: make e2e use old repo

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

---------

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>
Gustavo Fernandes de Carvalho 1 year ago
parent
commit
7bf0cf2e79

+ 3 - 3
deploy/charts/external-secrets/README.md

@@ -47,7 +47,7 @@ The command removes all the Kubernetes components associated with the chart and
 | certController.hostNetwork | bool | `false` | Run the certController on the host network |
 | certController.hostNetwork | bool | `false` | Run the certController on the host network |
 | certController.image.flavour | string | `""` |  |
 | certController.image.flavour | string | `""` |  |
 | certController.image.pullPolicy | string | `"IfNotPresent"` |  |
 | certController.image.pullPolicy | string | `"IfNotPresent"` |  |
-| certController.image.repository | string | `"ghcr.io/external-secrets/external-secrets"` |  |
+| certController.image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
 | certController.image.tag | string | `""` |  |
 | certController.image.tag | string | `""` |  |
 | certController.imagePullSecrets | list | `[]` |  |
 | certController.imagePullSecrets | list | `[]` |  |
 | certController.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
 | certController.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
@@ -111,7 +111,7 @@ The command removes all the Kubernetes components associated with the chart and
 | hostNetwork | bool | `false` | Run the controller on the host network |
 | hostNetwork | bool | `false` | Run the controller on the host network |
 | image.flavour | string | `""` | The flavour of tag you want to use There are different image flavours available, like distroless and ubi. Please see GitHub release notes for image tags for these flavors. By default, the distroless image is used. |
 | image.flavour | string | `""` | The flavour of tag you want to use There are different image flavours available, like distroless and ubi. Please see GitHub release notes for image tags for these flavors. By default, the distroless image is used. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"ghcr.io/external-secrets/external-secrets"` |  |
+| image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
 | image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
 | image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | imagePullSecrets | list | `[]` |  |
 | installCRDs | bool | `true` | If set, install and upgrade CRDs through helm chart. |
 | installCRDs | bool | `true` | If set, install and upgrade CRDs through helm chart. |
@@ -185,7 +185,7 @@ The command removes all the Kubernetes components associated with the chart and
 | webhook.hostNetwork | bool | `false` | Specifies if webhook pod should use hostNetwork or not. |
 | webhook.hostNetwork | bool | `false` | Specifies if webhook pod should use hostNetwork or not. |
 | webhook.image.flavour | string | `""` | The flavour of tag you want to use |
 | webhook.image.flavour | string | `""` | The flavour of tag you want to use |
 | webhook.image.pullPolicy | string | `"IfNotPresent"` |  |
 | webhook.image.pullPolicy | string | `"IfNotPresent"` |  |
-| webhook.image.repository | string | `"ghcr.io/external-secrets/external-secrets"` |  |
+| webhook.image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
 | webhook.image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
 | webhook.image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
 | webhook.imagePullSecrets | list | `[]` |  |
 | webhook.imagePullSecrets | list | `[]` |  |
 | webhook.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
 | webhook.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |

+ 1 - 1
deploy/charts/external-secrets/tests/__snapshot__/cert_controller_test.yaml.snap

@@ -41,7 +41,7 @@ should match snapshot of default values:
                 - --loglevel=info
                 - --loglevel=info
                 - --zap-time-encoding=epoch
                 - --zap-time-encoding=epoch
                 - --enable-partial-cache=true
                 - --enable-partial-cache=true
-              image: ghcr.io/external-secrets/external-secrets:v0.10.3
+              image: oci.external-secrets.io/external-secrets/external-secrets:v0.10.3
               imagePullPolicy: IfNotPresent
               imagePullPolicy: IfNotPresent
               name: cert-controller
               name: cert-controller
               ports:
               ports:

+ 1 - 1
deploy/charts/external-secrets/tests/__snapshot__/controller_test.yaml.snap

@@ -34,7 +34,7 @@ should match snapshot of default values:
                 - --metrics-addr=:8080
                 - --metrics-addr=:8080
                 - --loglevel=info
                 - --loglevel=info
                 - --zap-time-encoding=epoch
                 - --zap-time-encoding=epoch
-              image: ghcr.io/external-secrets/external-secrets:v0.10.3
+              image: oci.external-secrets.io/external-secrets/external-secrets:v0.10.3
               imagePullPolicy: IfNotPresent
               imagePullPolicy: IfNotPresent
               name: external-secrets
               name: external-secrets
               ports:
               ports:

+ 1 - 1
deploy/charts/external-secrets/tests/__snapshot__/webhook_test.yaml.snap

@@ -39,7 +39,7 @@ should match snapshot of default values:
                 - --healthz-addr=:8081
                 - --healthz-addr=:8081
                 - --loglevel=info
                 - --loglevel=info
                 - --zap-time-encoding=epoch
                 - --zap-time-encoding=epoch
-              image: ghcr.io/external-secrets/external-secrets:v0.10.3
+              image: oci.external-secrets.io/external-secrets/external-secrets:v0.10.3
               imagePullPolicy: IfNotPresent
               imagePullPolicy: IfNotPresent
               name: webhook
               name: webhook
               ports:
               ports:

+ 3 - 3
deploy/charts/external-secrets/values.yaml

@@ -21,7 +21,7 @@ bitwarden-sdk-server:
 revisionHistoryLimit: 10
 revisionHistoryLimit: 10
 
 
 image:
 image:
-  repository: ghcr.io/external-secrets/external-secrets
+  repository: oci.external-secrets.io/external-secrets/external-secrets
   pullPolicy: IfNotPresent
   pullPolicy: IfNotPresent
   # -- The image tag to use. The default is the chart appVersion.
   # -- The image tag to use. The default is the chart appVersion.
   tag: ""
   tag: ""
@@ -259,7 +259,7 @@ webhook:
   # -- Specifies if webhook pod should use hostNetwork or not.
   # -- Specifies if webhook pod should use hostNetwork or not.
   hostNetwork: false
   hostNetwork: false
   image:
   image:
-    repository: ghcr.io/external-secrets/external-secrets
+    repository: oci.external-secrets.io/external-secrets/external-secrets
     pullPolicy: IfNotPresent
     pullPolicy: IfNotPresent
     # -- The image tag to use. The default is the chart appVersion.
     # -- The image tag to use. The default is the chart appVersion.
     tag: ""
     tag: ""
@@ -417,7 +417,7 @@ certController:
   revisionHistoryLimit: 10
   revisionHistoryLimit: 10
 
 
   image:
   image:
-    repository: ghcr.io/external-secrets/external-secrets
+    repository: oci.external-secrets.io/external-secrets/external-secrets
     pullPolicy: IfNotPresent
     pullPolicy: IfNotPresent
     tag: ""
     tag: ""
     flavour: ""
     flavour: ""

+ 12 - 0
e2e/framework/addon/eso.go

@@ -43,14 +43,26 @@ func NewESO(mutators ...MutationFunc) *ESO {
 					Value: os.Getenv("VERSION"),
 					Value: os.Getenv("VERSION"),
 				},
 				},
 				{
 				{
+					Key:   "webhook.image.repository",
+					Value: "ghcr.io/external-secrets/external-secrets",
+				},
+				{
 					Key:   "certController.image.tag",
 					Key:   "certController.image.tag",
 					Value: os.Getenv("VERSION"),
 					Value: os.Getenv("VERSION"),
 				},
 				},
 				{
 				{
+					Key:   "certController.image.repository",
+					Value: "ghcr.io/external-secrets/external-secrets",
+				},
+				{
 					Key:   "image.tag",
 					Key:   "image.tag",
 					Value: os.Getenv("VERSION"),
 					Value: os.Getenv("VERSION"),
 				},
 				},
 				{
 				{
+					Key:   "image.repository",
+					Value: "ghcr.io/external-secrets/external-secrets",
+				},
+				{
 					Key:   "extraArgs.loglevel",
 					Key:   "extraArgs.loglevel",
 					Value: "debug",
 					Value: "debug",
 				},
 				},