chore(deps): update k8s libs to 1.11 versions

DEVELOPMENT.md

@@ -23,6 +23,18 @@ To run the tests for all go packages outside of the vendor directory, run:
 $ make test
 ```
 
+To run the e2e tests locally:
+
+```sh
+$ make e2e-local
+```
+
+To run a specific e2e test locally:
+
+```sh
+$ make e2e-local TEST=TestCreateInstallPlanManualApproval
+```
+
 #### Building
 
 Ensure your version of go is up to date; check that you're running v1.9 with the

Dockerfile

@@ -13,9 +13,9 @@ RUN go test -c -o /bin/e2e ./test/e2e/...
 FROM alpine:latest as olm
 LABEL olm=true
 WORKDIR /
-COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/alm /bin/alm
+COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
 EXPOSE 8080
-CMD ["/bin/alm"]
+CMD ["/bin/olm"]
 
 FROM alpine:latest as catalog
 LABEL catalog=true

Dockerfile.rhel7

@@ -11,6 +11,6 @@ COPY . .
 
 RUN make build
 
-RUN cp ./bin/alm /bin/alm
+RUN cp ./bin/olm /bin/olm
 RUN cp ./bin/catalog /bin/catalog
 EXPOSE 8080

Gopkg.toml

@@ -33,24 +33,24 @@
   version = "1.2.1"
 
 [[constraint]]
-  branch = "release-1.9"
+  branch = "release-1.11"
   name = "k8s.io/api"
 
 [[constraint]]
-  branch = "release-1.9"
+  branch = "release-1.11"
   name = "k8s.io/apiextensions-apiserver"
 
 [[constraint]]
-  branch = "release-1.9"
+  branch = "release-1.11"
   name = "k8s.io/apimachinery"
 
 [[constraint]]
-  branch = "release-1.9"
+  branch = "release-1.11"
   name = "k8s.io/apiserver"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.9.3"
+  version = "kubernetes-1.11.1"
 
 [[constraint]]
   name = "github.com/writeas/go-strip-markdown"

Makefile

@@ -17,6 +17,9 @@ all: test build
 
 test: schema-check cover.out
 
+unit:
+	go test -v -race ./pkg/...
+
 schema-check:
 	go run ./cmd/validator/main.go ./deploy/chart/catalog_resources
 
@@ -59,15 +62,15 @@ run-local-shift:
 
 e2e-local:
 	. ./scripts/build_local.sh
-	. ./scripts/run_e2e_local.sh
+	. ./scripts/run_e2e_local.sh $(TEST)
 
 e2e-local-shift:
 	. ./scripts/build_local_shift.sh
-	. ./scripts/run_e2e_local.sh
+	. ./scripts/run_e2e_local.sh $(TEST)
 
 e2e-local-docker:
 	. ./scripts/build_local.sh
-	. ./scripts/run_e2e_docker.sh
+	. ./scripts/run_e2e_docker.sh $(TEST)
 
 DEP := $(GOPATH)/bin/dep
 $(DEP):
@@ -100,25 +103,10 @@ $(CODEGEN):
 	# dep doesn't currently support downloading dependencies that don't have go in the top-level dir.
 	# can move to managing with dep when merged: https://github.com/golang/dep/pull/1545
 	mkdir -p vendor/k8s.io/code-generator
-	git clone --branch release-1.9 https://github.com/kubernetes/code-generator.git vendor/k8s.io/code-generator
-	# codegen tools currently don't allow specifying custom boilerplate, so we move ours to the default location
-	mkdir -p $(GOPATH)/src/k8s.io/kubernetes/hack/boilerplate
-	cp boilerplate.go.txt $(GOPATH)/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt
-
-define replace
-@find ./pkg/api/client -type f -exec \
-		sed -i.bak 's/\(\"'$(1)'\)\(-v1\)*\(s\)*/\1-v1\3/g' {} \; -exec rm {}.bak \;
-@find ./pkg/api/client -type f -exec \
-		sed -i.bak 's/Group: \"'$(1)'-v1\"/Group: \"app.coreos.com\"/g' {} \; -exec rm {}.bak \;
-endef
+	git clone --branch release-1.11 https://github.com/kubernetes/code-generator.git vendor/k8s.io/code-generator
+
 codegen: $(CODEGEN)
-	$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis \
-		"catalogsource:v1alpha1 clusterserviceversion:v1alpha1 installplan:v1alpha1 subscription:v1alpha1"
-	# codegen doesn't respect pluralnames, so we manually set them here
-	$(call replace,"catalogsource")
-	$(call replace,"clusterserviceversion")
-	$(call replace,"installplan")
-	$(call replace,"subscription")
+	$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1"
 
 verify-codegen: codegen
 	git diff --exit-code

cmd/alm/main.go → cmd/olm/main.go

@@ -10,7 +10,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/alm"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"
 )
 
@@ -74,7 +74,7 @@ func main() {
 	namespaces := strings.Split(*watchedNamespaces, ",")
 
 	// Create a new instance of the operator.
-	almOperator, err := alm.NewALMOperator(*kubeConfigPath, *wakeupInterval, annotation, namespaces)
+	operator, err := olm.NewOperator(*kubeConfigPath, *wakeupInterval, annotation, namespaces)
 
 	if err != nil {
 		log.Fatalf("error configuring operator: %s", err.Error())
@@ -86,5 +86,5 @@ func main() {
 	})
 	go http.ListenAndServe(":8080", nil)
 
-	almOperator.Run(stopCh)
+	operator.Run(stopCh)
 }

deploy/chart/catalog_resources/components/chargeback.v0.5.1.clusterserviceversion.yaml

@@ -1,7 +1,7 @@
 #! validate-crd: ./deploy/chart/templates/03-clusterserviceversion.crd.yaml
 #! parse-kind: ClusterServiceVersion
 apiVersion: app.coreos.com/v1alpha1
-kind: ClusterServiceVersion-v1
+kind: ClusterServiceVersion
 metadata:
   name: chargeback-helm-operator.v0.5.1
   namespace: placeholder