Skip to content

Commit eb5a959

Browse files
authored
helm: change default registry (#10746)
1 parent 8485c28 commit eb5a959

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

.github/actions/kube-gateway-api-conformance-tests/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ runs:
5757
# If matrix.version is empty, use the local chart path specified in the Makefile.
5858
helm upgrade -i -n kgateway-system kgateway ./install/helm/kgateway/ \
5959
--create-namespace \
60-
--set image.tag=${VERSION}
60+
--set image.tag=${VERSION} --set image.registry=ghcr.io/kgateway-dev
6161
else
6262
# TODO(tim): this will require changes once the new helm chart is integrated
6363
# and published with the release pipeline.

.github/workflows/release.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
- main
2222

2323
env:
24+
# this is uses the `github.repository_owner` to support releases from forks (useful for testing).
2425
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
2526

2627
permissions:
@@ -172,11 +173,9 @@ jobs:
172173
- name: Install the released chart
173174
run: |
174175
helm install --create-namespace --namespace kgateway-system kgateway \
175-
oci://${{ env.IMAGE_REGISTRY }}/charts/kgateway \
176+
oci://${{ env.IMAGE_REGISTRY }}/kgateway-dev/charts/kgateway \
177+
--set image.registry=${{ env.IMAGE_REGISTRY }} \
176178
--version ${{ needs.setup.outputs.version }} \
177-
--set controller.image.registry=${{ env.IMAGE_REGISTRY }} \
178-
--set gateway.envoyContainer.image.registry=${{ env.IMAGE_REGISTRY }} \
179-
--set gateway.sdsContainer.image.registry=${{ env.IMAGE_REGISTRY }} \
180179
--wait --timeout 5m
181180
182181
- name: Wait for the kgateway deployment to be ready

.goreleaser.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ release:
164164
165165
The docker images are available at:
166166
167-
- {{ .Env.IMAGE_REGISTRY }}:{{ .Env.CONTROLLER_IMAGE_REPO }}:{{ .Env.VERSION }}
168-
- {{ .Env.IMAGE_REGISTRY }}:{{ .Env.SDS_IMAGE_REPO }}:{{ .Env.VERSION }}
169-
- {{ .Env.IMAGE_REGISTRY }}:{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}
167+
- cr.kgateway.dev/kgateway-dev/{{ .Env.CONTROLLER_IMAGE_REPO }}:{{ .Env.VERSION }}
168+
- cr.kgateway.dev/kgateway-dev/{{ .Env.SDS_IMAGE_REPO }}:{{ .Env.VERSION }}
169+
- cr.kgateway.dev/kgateway-dev/{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}
170170
171171
## Quickstart
172172

Tiltfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN chmod 777 ./$binary_name
5757
standard_entrypoint = "ENTRYPOINT /app/start.sh /app/$binary_name"
5858
debug_entrypoint = "ENTRYPOINT /app/start.sh /go/bin/dlv --listen=0.0.0.0:$debug_port --api-version=2 --headless=true --only-same-user=false --accept-multiclient --check-go-version=false exec --continue /app/$binary_name"
5959

60-
get_resources_cmd = "{0} -n {1} template {2} --include-crds install/helm/kgateway/ --set image.pullPolicy='Never' --set image.tag='{3}'".format(helm_cmd, settings.get("helm_installation_namespace"), settings.get("helm_installation_name"), image_tag)
60+
get_resources_cmd = "{0} -n {1} template {2} --include-crds install/helm/kgateway/ --set image.pullPolicy='Never' --set image.registry=ghcr.io/kgateway-dev --set image.tag='{3}'".format(helm_cmd, settings.get("helm_installation_namespace"), settings.get("helm_installation_name"), image_tag)
6161
for f in settings.get("helm_values_files") :
6262
get_resources_cmd = get_resources_cmd + " --values=" + f
6363

@@ -204,7 +204,7 @@ def install_kgateway():
204204
if not kgateway_installed :
205205
install_helm_cmd = """
206206
kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || {{ kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.1.0/standard-install.yaml; }} ;
207-
{0} upgrade --install -n {1} --create-namespace {2} install/helm/kgateway/ --set controller.image.pullPolicy='Never' --set image.tag='{3}'""".format(helm_cmd, settings.get("helm_installation_namespace"), settings.get("helm_installation_name"), image_tag)
207+
{0} upgrade --install -n {1} --create-namespace {2} install/helm/kgateway/ --set controller.image.pullPolicy='Never' --set image.registry=ghcr.io/kgateway-dev --set image.tag='{3}'""".format(helm_cmd, settings.get("helm_installation_namespace"), settings.get("helm_installation_name"), image_tag)
208208
for f in settings.get("helm_values_files") :
209209
install_helm_cmd = install_helm_cmd + " --values=" + f
210210
local_resource(

install/helm/kgateway/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ gateway:
138138
statsRoutePrefixRewrite: "/stats"
139139

140140
image:
141-
registry: ghcr.io/kgateway-dev
141+
registry: cr.kgateway.dev/kgateway-dev
142142
tag: ""
143143
pullPolicy: IfNotPresent

test/kubernetes/e2e/tests/manifests/common-recommendations.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# defaults in our values-template.yaml overtime. That way, users of the product can have the easiest experience,
1111
# and gain the best value, without custom configuration.
1212

13+
image:
14+
registry: ghcr.io/kgateway-dev
15+
1316
# Configuration for the kgateway controller pod
1417
controller:
1518
# we need to be able to troubleshoot failures using logs; when users encounter problems enabling debug logging is

0 commit comments

Comments
 (0)