Skip to content

Commit

Permalink
Use eclipse images everywhere.
Browse files Browse the repository at this point in the history
Signed-off-by: Oleksandr Andriienko <[email protected]>
  • Loading branch information
AndrienkoAleksandr committed Sep 20, 2021
1 parent 4e48d7a commit d7f5f82
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# quay.io/eclipse/kubernetes-image-puller-operator-bundle:$VERSION and quay.io/eclipse/kubernetes-image-puller-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/aandriienko/kubernetes-image-puller-operator
IMAGE_TAG_BASE ?= quay.io/eclipse/kubernetes-image-puller-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)

# Image URL to use all building/pushing image targets
IMG ?= quay.io/aandriienko/kubernetes-image-puller-operator:0.0.9
IMG ?= quay.io/eclipse/kubernetes-image-puller-operator:0.0.9
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"

Expand Down Expand Up @@ -248,4 +248,4 @@ bundle-pre-release:
sed -i -e "s/\(name: kubernetes-imagepuller-operator.v\).*/\1$${version}/" "$${csvFileRelease}"
sed -ri "s/version: [0-9]+.[0-9]+.[0-9]/version: $${version}/g" "$${csvFileRelease}"
sed -ri "s/replaces: kubernetes-imagepuller-operator.v[0-9]+.[0-9]+.[0-9]/replaces: kubernetes-imagepuller-operator.$${previousPackageVersion}/g" "$${csvFileRelease}"
sed -ri "s|image: quay.io/aandriienko/kubernetes-image-puller-operator:next|image: quay.io/aandriienko/kubernetes-image-puller-operator:$${version}|g" "$${csvFileRelease}"
sed -ri "s|image: quay.io/eclipse/kubernetes-image-puller-operator:next|image: quay.io/eclipse/kubernetes-image-puller-operator:$${version}|g" "$${csvFileRelease}"
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: kubernetes-image-puller-operator
image: quay.io/aandriienko/kubernetes-image-puller-operator:next
image: quay.io/eclipse/kubernetes-image-puller-operator:next
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/aandriienko/kubernetes-image-puller-operator-bundle
newTag: next
newName: quay.io/eclipse/kubernetes-image-puller-operator
newTag: 0.0.9
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
serviceAccountName: kubernetes-image-puller-operator
containers:
- name: kubernetes-image-puller-operator
image: quay.io/aandriienko/kubernetes-image-puller-operator:next
image: quay.io/eclipse/kubernetes-image-puller-operator:next
command:
- /manager
args:
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/catalogsource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: olm
spec:
sourceType: grpc
image: quay.io/aandriienko/image-puller-catalog-source:latest
image: quay.io/eclipse/image-puller-catalog-source:latest
updateStrategy:
registryPoll:
interval: 5m

0 comments on commit d7f5f82

Please sign in to comment.