Skip to content

Commit f758908

Browse files
committed
chore: migrate to public ECR and standardize image naming
Updates ECR repository references from private to public ECR and standardizes image naming conventions across the project.
1 parent 9494b52 commit f758908

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Dockerfile.cross
2727

2828
kro-controller
2929
kro-chart*
30+
kro-*
3031
cover.html
3132
.read
3233
.snapshots

Makefile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
AWS_ACCOUNT_ID ?= $(shell aws sts get-caller-identity --query Account --output text)
33
AWS_REGION ?= us-west-2
44
RELEASE_VERSION ?= dev-$(shell git rev-parse --short HEAD)
5-
ECR_REPO ?= ${AWS_ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com
6-
7-
CONTROLLER_IMAGE ?= ${ECR_REPO}/kro:${RELEASE_VERSION}
8-
HELM_IMAGE ?= ${ECR_REPO}/kro-chart:${RELEASE_VERSION}
9-
DOCS_IMAGE ?= ${ECR_REPO}/kro-docs:${RELEASE_VERSION}
5+
ECR_REPO ?= public.ecr.aws/kro
106

7+
CONTROLLER_IMAGE ?= ${ECR_REPO}/controller:${RELEASE_VERSION}
8+
HELM_IMAGE ?= ${ECR_REPO}
119
KO_DOCKER_REPO ?= ${ECR_REPO}/kro
10+
1211
KOCACHE ?= ~/.ko
1312
KO_PUSH ?= true
1413

@@ -177,13 +176,13 @@ $(CONTROLLER_GEN): $(LOCALBIN)
177176

178177
.PHONY: image
179178
build-image: ## Build the kro controller images using ko build
180-
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/kro" \
179+
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="public.ecr.aws/kro/controller" \
181180
ko build --bare github.com/awslabs/kro/cmd/controller \
182181
--push=false --tags ${RELEASE_VERSION} --sbom=none
183182

184183
.PHONY: publish
185184
publish-image: ## Publish the kro controller images to ECR
186-
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="095708837592.dkr.ecr.us-west-2.amazonaws.com/kro" \
185+
$(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="public.ecr.aws/kro/controller" \
187186
ko publish --bare github.com/awslabs/kro/cmd/controller \
188187
--tags ${RELEASE_VERSION} --sbom=none
189188

@@ -197,7 +196,7 @@ package-helm: ## Package Helm chart
197196

198197
.PHONY: publish-helm
199198
publish-helm: ## Helm publish
200-
helm push ./kro-chart-${RELEASE_VERSION}.tgz oci://${ECR_REPO}
199+
helm push ./kro-${RELEASE_VERSION}.tgz oci://${HELM_IMAGE}
201200

202201
.PHONY:
203202
release: build-image publish-image package-helm publish-helm

helm/Chart.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apiVersion: v2
2-
name: kro-chart
2+
name: kro
33
description: A Helm chart for kro
44
type: application
5-
version: 0.1.0
6-
appVersion: "0.1.0"
5+
version: 0.1.0-rc.3
6+
appVersion: "0.1.0-rc.3"
7+
home: https://kro.run/

helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
image:
2-
repository: public.ecr.aws/kro
2+
repository: public.ecr.aws/kro/controller
33
pullPolicy: IfNotPresent
44
# Overrides the image tag whose default is the chart appVersion.
5-
tag: "0.1.0"
5+
tag: "0.1.0-rc.3"
66

77
imagePullSecrets: []
88
nameOverride: ""

0 commit comments

Comments
 (0)