Skip to content

Commit

Permalink
Fix up image reference for tests
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Nov 4, 2020
1 parent f8c20a8 commit a3b31a2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -37,13 +37,13 @@ uninstall: manifests

# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
deploy: manifests
cd config/controller && kustomize edit set image controller=ghcr.io/alexellis/registry-creds-controller:$(TAG)
cd config/controller && kustomize edit set image controller=ghcr.io/alexellis/registry-creds:$(TAG)
kustomize build config/default | kubectl apply -f -

.PHONY: shrinkwrap
shrinkwrap:
cd config/default && \
kustomize edit set image ghcr.io/alexellis/registry-creds-controller:$(TAG) && \
kustomize edit set image ghcr.io/alexellis/registry-creds:$(TAG) && \
kustomize build > ../../manifest.yaml
# Generate manifests e.g. CRD, RBAC etc.
manifests: controller-gen
Expand All @@ -66,7 +66,7 @@ docker-build:
@docker buildx create --use --name=multiarch --node=multiarch && \
docker buildx build \
--output "type=docker,push=false" \
--tag alexellis2/registry-creds-controller:$(TAG) \
--tag alexellis2registry-creds:$(TAG) \
.

.PHONY: docker-publish # Push the docker image to the remote registry
Expand All @@ -75,7 +75,7 @@ docker-publish:
docker buildx build \
--platform linux/amd64,linux/arm/v7,linux/arm64 \
--output "type=image,push=true" \
--tag alexellis2/registry-creds-controller:$(TAG) .
--tag alexellis2registry-creds:$(TAG) .

# find or download controller-gen
# download controller-gen if necessary
Expand Down
2 changes: 1 addition & 1 deletion config/controller/controller.yaml
Expand Up @@ -27,7 +27,7 @@ spec:
- /controller
args:
- --enable-leader-election
image: ghcr.io/alexellis/registry-creds-controller:0.2.0
image: ghcr.io/alexellis/registry-creds:0.2.0
name: controller
imagePullPolicy: IfNotPresent
resources:
Expand Down
2 changes: 2 additions & 0 deletions config/default/kustomization.yaml
Expand Up @@ -11,5 +11,7 @@ resources:
- ../rbac
- ../controller
images:
- name: ghcr.io/alexellis/registry-creds
newTag: 0.2.2
- name: ghcr.io/alexellis/registry-creds-controller
newTag: 0.2.2
2 changes: 1 addition & 1 deletion manifest.yaml
Expand Up @@ -229,7 +229,7 @@ spec:
- --enable-leader-election
command:
- /controller
image: ghcr.io/alexellis/registry-creds-controller:0.2.2
image: ghcr.io/alexellis/registry-creds:0.2.2
imagePullPolicy: IfNotPresent
name: controller
resources:
Expand Down

0 comments on commit a3b31a2

Please sign in to comment.