refactor(images): use operator-framework namespace for all olm images

operator-framework · Mar 12, 2019 · d7ab91b · d7ab91b
1 parent e98d03b
commit d7ab91b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/Documentation/design/developing.md b/Documentation/design/developing.md
@@ -6,7 +6,7 @@
  * Make any config customizations by editing `example-values.yaml`
  * Deploy a namespaced copy of OLM
 ```sh
-./scripts/package-release.sh 1.0.0-custom custom-olm ./Documentation/install/example-values.yaml
+./scripts/package_release.sh 1.0.0-custom custom-olm ./Documentation/install/example-values.yaml
 kubectl create ns olm-testing
 kubectl get secrets -n tectonic-system -o yaml coreos-pull-secret | sed 's/tectonic-system/olm-testing/g' | kubectl create -f -
 kubectl apply -f ./custom-olm
@@ -58,7 +58,7 @@ kubectl apply -f ./custom-olm
 * either apply the new configmap on it's own and restart catalog or, easier, just run:
 
 ```sh
-./scripts/package-release.sh 1.0.0-custom custom-olm ./Documentation/install/example-values.yaml
+./scripts/package_release.sh 1.0.0-custom custom-olm ./Documentation/install/example-values.yaml
 kubectl apply -f ./custom-olm
 ```
 

diff --git a/Documentation/install/install.md b/Documentation/install/install.md
@@ -55,7 +55,7 @@ olm:
   replicaCount: 1
   # The image to run. If not building a local image, use sha256 image references
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     # port for readiness/liveness probes
@@ -67,7 +67,7 @@ catalog:
   replicaCount: 1
   # The image to run. If not building a local image, use sha256 image references
   image:
-    ref: quay.io/coreos/catalog:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     # port for readiness/liveness probes
@@ -77,13 +77,13 @@ catalog:
 To configure a release of OLM for installation in a cluster:
 
 1. Create a `my-values.yaml` like the example above with the desired configuration or choose an existing one from this repository. The latest production values can be found in [deploy/tectonic-alm-operator/values.yaml](../../deploy/tectonic-alm-operator/values.yaml).
-1. Generate deployment files from the templates and the `my-values.yaml` using `package-release.sh`
+1. Generate deployment files from the templates and the `my-values.yaml` using `package_release.sh`
 
    ```bash
    # first arg must be a semver-compatible version string
    # second arg is the output directory
    # third arg is the values.yaml file
-   ./scripts/package-release.sh 1.0.0-myolm ./my-olm-deployment my-values.yaml
+   ./scripts/package_release.sh 1.0.0-myolm ./my-olm-deployment my-values.yaml
    ```
 
 1. Deploy to kubernetes: `kubectl apply -f ./my-olm-deployment/templates/`

diff --git a/Documentation/install/local-values.yaml b/Documentation/install/local-values.yaml
@@ -8,26 +8,26 @@ debug: true
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
 
 catalog:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
 
 package:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 5443
 
 catalog_sources:
- - rh-operators
+  - rh-operators
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
@@ -9,7 +9,7 @@ debug: false
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:master
+    ref: quay.io/operator-framework/olm:master
     pullPolicy: Always
   service:
     internalPort: 8080
@@ -20,7 +20,7 @@ catalog:
   replicaCount: 1
   commandArgs: -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
   image:
-    ref: quay.io/coreos/olm:master
+    ref: quay.io/operator-framework/olm:master
     pullPolicy: Always
   service:
     internalPort: 8080
@@ -30,7 +30,7 @@ catalog:
 package:
   replicaCount: 2
   image:
-    ref: quay.io/coreos/olm:master
+    ref: quay.io/operator-framework/olm:master
     pullPolicy: Always
   service:
     internalPort: 5443

diff --git a/scripts/build_local.sh b/scripts/build_local.sh
@@ -10,6 +10,6 @@ if [ -z "$NO_MINIKUBE" ]; then
   eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
   kubectl config use-context minikube
 fi
-docker build -f e2e.Dockerfile .
-docker tag $(docker images --filter 'label=stage=olm' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/coreos/olm:local
-docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/coreos/olm-e2e:local
+docker build -f upstream.Dockerfile .
+docker tag $(docker images --filter 'label=stage=olm' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm:local
+docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm-e2e:local
diff --git a/scripts/run_e2e_docker.sh b/scripts/run_e2e_docker.sh
@@ -17,7 +17,7 @@ cp test/e2e/e2e-values.yaml "$test_e2e_config"
   echo "catalog_namespace: ${namespace}";
   echo "operator_namespace: ${operator_namespace}"; }  >> "$test_e2e_config"
 
-./scripts/package-release.sh 1.0.0 test/e2e/resources "$test_e2e_config"
+./scripts/package_release.sh 1.0.0 test/e2e/resources "$test_e2e_config"
 
 function cleanup {
 	for resource in test/e2e/test-resources/*.yaml; do

diff --git a/scripts/run_e2e_local.sh b/scripts/run_e2e_local.sh
@@ -18,7 +18,7 @@ cp test/e2e/e2e-values.yaml "$test_e2e_config"
   echo "catalog_namespace: ${namespace}";
   echo "operator_namespace: ${operator_namespace}"; }  >> "$test_e2e_config"
 
-./scripts/package-release.sh 1.0.0 test/e2e/resources "$test_e2e_config"
+./scripts/package_release.sh 1.0.0 test/e2e/resources "$test_e2e_config"
 
 function cleanup {
 	for resource in test/e2e/resources/*.yaml; do

diff --git a/test/e2e/e2e-bare-values.yaml b/test/e2e/e2e-bare-values.yaml
@@ -5,7 +5,7 @@ writeStatusName: '""'
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -14,7 +14,7 @@ olm:
 catalog:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -23,17 +23,17 @@ catalog:
 package:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 5443
   commandArgs: -test.coverprofile=/tmp/catalog-coverage.cov
 
 e2e:
   image:
-    ref: quay.io/coreos/olm-e2e:local
+    ref: quay.io/operator-framework/olm-e2e:local
 
 job_name: e2e
 
 catalog_sources:
- - rh-operators
+  - rh-operators
diff --git a/test/e2e/e2e-values.yaml b/test/e2e/e2e-values.yaml
@@ -3,7 +3,7 @@ writeStatusName: '""'
 olm:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -12,7 +12,7 @@ olm:
 catalog:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 8080
@@ -21,17 +21,17 @@ catalog:
 package:
   replicaCount: 1
   image:
-    ref: quay.io/coreos/olm:local
+    ref: quay.io/operator-framework/olm:local
     pullPolicy: IfNotPresent
   service:
     internalPort: 5443
   commandArgs: --debug
 
 e2e:
   image:
-    ref: quay.io/coreos/olm-e2e:local
+    ref: quay.io/operator-framework/olm-e2e:local
 
 job_name: e2e
 
 catalog_sources:
- - rh-operators
+  - rh-operators