Changes for new branch quinteros

ManageIQ · Aug 12, 2023 · 7e61c1e · 7e61c1e
1 parent 4d323ab
commit 7e61c1e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/bin/build b/bin/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TAG=latest
+TAG=latest-quinteros
 
 ARCH=`uname -m`
 

diff --git a/bin/remove_images b/bin/remove_images
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-TAG=latest
+TAG=latest-quinteros
 
 while getopts "t:r:h" opt; do
   case $opt in

diff --git a/images/manageiq-base-worker/Dockerfile b/images/manageiq-base-worker/Dockerfile
@@ -1,5 +1,5 @@
 ARG FROM_REPO=manageiq
-ARG FROM_TAG=latest
+ARG FROM_TAG=latest-quinteros
 
 FROM ${FROM_REPO}/manageiq-base:${FROM_TAG} AS vddk
 

diff --git a/images/manageiq-orchestrator/Dockerfile b/images/manageiq-orchestrator/Dockerfile
@@ -1,5 +1,5 @@
 ARG FROM_REPO=manageiq
-ARG FROM_TAG=latest
+ARG FROM_TAG=latest-quinteros
 
 FROM ${FROM_REPO}/manageiq-base:${FROM_TAG}
 MAINTAINER ManageIQ https://manageiq.org

diff --git a/images/manageiq-ui-worker/Dockerfile b/images/manageiq-ui-worker/Dockerfile
@@ -1,5 +1,5 @@
 ARG FROM_REPO=manageiq
-ARG FROM_TAG=latest
+ARG FROM_TAG=latest-quinteros
 
 FROM ${FROM_REPO}/manageiq-webserver-worker:${FROM_TAG}
 MAINTAINER ManageIQ https://manageiq.org

diff --git a/images/manageiq-webserver-worker/Dockerfile b/images/manageiq-webserver-worker/Dockerfile
@@ -1,5 +1,5 @@
 ARG FROM_REPO=manageiq
-ARG FROM_TAG=latest
+ARG FROM_TAG=latest-quinteros
 
 FROM ${FROM_REPO}/manageiq-base-worker:${FROM_TAG}
 MAINTAINER ManageIQ https://manageiq.org

diff --git a/manageiq-operator/README.md b/manageiq-operator/README.md
@@ -34,7 +34,7 @@ There are three different ways the operator can be run.
   2 - Update the operator deployment yaml file with your custom image:
 
     ```bash
-    $ sed -i 's|docker.io/manageiq/manageiq-operator:latest|docker.io/<your_username_or_organization>/manageiq-operator:latest|g' config/manager/manager.yaml
+    $ sed -i 's|docker.io/manageiq/manageiq-operator:latest-quinteros|docker.io/<your_username_or_organization>/manageiq-operator:latest-quinteros|g' config/manager/manager.yaml
     ```
 
   3 - Run your custom image from the registry:

diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
@@ -244,7 +244,7 @@ func orchestratorImageNamespace(cr *miqv1alpha1.ManageIQ) string {
 
 func orchestratorImageTag(cr *miqv1alpha1.ManageIQ) string {
 	if cr.Spec.OrchestratorImageTag == "" {
-		return "latest"
+		return "latest-quinteros"
 	} else {
 		return cr.Spec.OrchestratorImageTag
 	}

diff --git a/manageiq-operator/api/v1alpha1/manageiq_types.go b/manageiq-operator/api/v1alpha1/manageiq_types.go
@@ -261,7 +261,7 @@ type ManageIQSpec struct {
 	// +optional
 	OrchestratorImageNamespace string `json:"orchestratorImageNamespace,omitempty"`
 
-	// Deprecated: Image tag used for the orchestrator and worker deployments (default: latest)
+	// Deprecated: Image tag used for the orchestrator and worker deployments (default: latest-quinteros)
 	// +optional
 	OrchestratorImageTag string `json:"orchestratorImageTag,omitempty"`
 

diff --git a/manageiq-operator/config/manager/manager.yaml b/manageiq-operator/config/manager/manager.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: manageiq-operator
       containers:
         - name: manageiq-operator
-          image: docker.io/manageiq/manageiq-operator:latest
+          image: docker.io/manageiq/manageiq-operator:latest-quinteros
           imagePullPolicy: Always
           env:
             - name: WATCH_NAMESPACE