Rebase the code

janus-idp · Jan 10, 2024 · 9f163a9 · 9f163a9
1 parent 18e0c86
commit 9f163a9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/bundle/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/manifests/backstage-operator.clusterserviceversion.yaml
@@ -206,11 +206,7 @@ spec:
                   value: quay.io/fedora/postgresql-15:latest
                 - name: RELATED_IMAGE_backstage
                   value: quay.io/janus-idp/backstage-showcase:next
-<<<<<<< HEAD
                 image: quay.io/janus-idp/operator:0.0.1
-=======
-                image: quay.io/janus/operator:v0.0.1
->>>>>>> ff714ce (revert to use default image tag based on VERSION in Makefile)
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,13 +4,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-<<<<<<< HEAD
   newName: quay.io/janus-idp/operator
   newTag: 0.0.1
-=======
-  newName: quay.io/janus/operator
-  newTag: v0.0.1
->>>>>>> ff714ce (revert to use default image tag based on VERSION in Makefile)
 
 generatorOptions:
   disableNameSuffixHash: true