Merge pull request #752 from njhale/change-upstream-base

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

Author: openshift-merge-robot

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
 ```
 

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/`

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

Makefile

@@ -4,16 +4,16 @@
 
 SHELL := /bin/bash
 PKG   := github.com/operator-framework/operator-lifecycle-manager
-CMDS  := $(addprefix bin/, $(shell go list ./cmd/... | xargs -I{} basename {}))
+MOD_FLAGS := $(shell (go version | grep -q -E "1\.(11|12)") && echo -mod=vendor)
+CMDS  := $(addprefix bin/, $(shell go list $(MOD_FLAGS) ./cmd/... | xargs -I{} basename {}))
 CODEGEN := ./vendor/k8s.io/code-generator/generate_groups.sh
 MOCKGEN := ./scripts/generate_mocks.sh
 counterfeiter := $(GOBIN)/counterfeiter
 mockgen := $(GOBIN)/mockgen
-IMAGE_REPO := quay.io/coreos/olm
+IMAGE_REPO := quay.io/operator-framework/olm
 IMAGE_TAG ?= "dev"
 KUBE_DEPS := api apiextensions-apiserver apimachinery code-generator kube-aggregator kubernetes
 KUBE_RELEASE := release-1.11
-MOD_FLAGS := $(shell (go version | grep -q 1.11) && echo -mod=vendor)
 
 .PHONY: build test run clean vendor schema-check \
 	vendor-update coverage coverage-html e2e .FORCE
@@ -51,13 +51,13 @@ $(CMDS):
 run-local:
 	. ./scripts/build_local.sh
 	mkdir -p build/resources
-	. ./scripts/package-release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
+	. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
 	. ./scripts/install_local.sh local build/resources
 	rm -rf build
 
 deploy-local:
 	mkdir -p build/resources
-	. ./scripts/package-release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
+	. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
 	. ./scripts/install_local.sh local build/resources
 	rm -rf build
 
@@ -67,7 +67,7 @@ e2e.namespace:
 # useful if running e2e directly with `go test -tags=bare`
 setup-bare: clean e2e.namespace
 	. ./scripts/build_bare.sh
-	. ./scripts/package-release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
+	. ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
 	. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
 
 e2e:
@@ -161,8 +161,8 @@ gen-all: gen-ci container-codegen container-mockgen
 # then tag those builds in quay with the version in OLM_VERSION
 release: ver=$(shell cat OLM_VERSION)
 release:
-	docker pull quay.io/coreos/olm:$(ver)
-	$(MAKE) target=upstream ver=$(ver) package
+	docker pull quay.io/operator-framework/olm:$(ver)
+	$(MAKE) target=upstream ver=$(ver) quickstart=true package
 	$(MAKE) target=okd ver=$(ver) package
 	$(MAKE) target=ocp ver=$(ver) package
 	rm -rf manifests
@@ -171,7 +171,7 @@ release:
 	find ./manifests -type f -exec sed -i "/^#/d" {} \; 
 	find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
 
-package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
+package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/operator-framework/olm:$(ver))
 package:
 ifndef target
 	$(error target is undefined)
@@ -182,5 +182,8 @@ endif
 	yq w -i deploy/$(target)/values.yaml olm.image.ref $(olmref)
 	yq w -i deploy/$(target)/values.yaml catalog.image.ref $(olmref)
 	yq w -i deploy/$(target)/values.yaml package.image.ref $(olmref)
-	./scripts/package-release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
+	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
+ifeq ($(quickstart), true)
+	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/manifests/quickstart/olm.yaml
+endif

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

go.mod

@@ -2,7 +2,7 @@ module github.com/operator-framework/operator-lifecycle-manager
 
 require (
 	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/etcd v3.3.11+incompatible // indirect
+	github.com/coreos/etcd v3.3.12+incompatible // indirect
 	github.com/coreos/go-semver v0.2.0
 	github.com/coreos/go-systemd v0.0.0-20190204112023-081494f7ee4f // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect

go.sum

@@ -22,8 +22,8 @@ github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.9+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/etcd v3.3.11+incompatible h1:0gCnqKsq7XxMi69JsnbmMc1o+RJH3XH64sV9aiTTYko=
-github.com/coreos/etcd v3.3.11+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.12+incompatible h1:5k8nkcBSvltjOO5RLflnXevOJXndlKIMbvVnMTX+cUU=
+github.com/coreos/etcd v3.3.12+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=

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

scripts/package-quickstart.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [[ ${#@} < 2 ]]; then
+    echo "Usage: $0 concatenate OLM's Kubernetes manifests into a single YAML stream and writes the result to a file"
+    echo "* dir: the input directory that contains OLM's Kubernetes manifests"
+    echo "* out: the output file for the combined OLM Kubernetes manifest"
+    exit 1
+fi
+
+dir=$1
+out=$2
+
+awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' ${dir}/*.yaml > ${out} && \
+   echo "Wrote manifest to ${out}"
+