Merge branch 'master' into deploy-debug

Author: njhale

Dockerfile

@@ -24,7 +24,7 @@ COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-man
 USER 1001
 
 EXPOSE 8080
-EXPOSE 443
+EXPOSE 5443
 
 # Apply labels as needed. ART build automation fills in others required for
 # shipping, including component NVR (name-version-release) and image name. OSBS

Documentation/install/local-values.yaml

@@ -26,7 +26,7 @@ package:
     ref: quay.io/coreos/olm:local
     pullPolicy: IfNotPresent
   service:
-    internalPort: 443
+    internalPort: 5443
 
 catalog_sources:
  - rh-operators

e2e.Dockerfile

@@ -20,7 +20,7 @@ COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-man
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
 EXPOSE 8080
-EXPOSE 443
+EXPOSE 5443
 CMD ["/bin/olm"]
 
 FROM golang:1.10

pkg/controller/operators/olm/operator.go

@@ -86,11 +86,6 @@ func NewOperator(crClient versioned.Interface, opClient operatorclient.ClientInt
 		op.RegisterQueueInformer(queueInformer)
 	}
 
-	// annotate namespaces that ALM operator manages
-	if err := namespaceAnnotator.AnnotateNamespaces(namespaces); err != nil {
-		return nil, err
-	}
-
 	// set up RBAC informers
 	informerFactory := informers.NewSharedInformerFactory(opClient.KubernetesInterface(), wakeupInterval)
 	roleInformer := informerFactory.Rbac().V1().Roles()

test/e2e/csv_e2e_test.go

@@ -816,7 +816,7 @@ func TestCreateCSVWithOwnedAPIService(t *testing.T) {
 						Version:        "v1alpha1",
 						Kind:           "PackageManifest",
 						DeploymentName: depName,
-						ContainerPort:  int32(443),
+						ContainerPort:  int32(5443),
 						DisplayName:    "Package Manifest",
 						Description:    "An apiservice that exists",
 					},

test/e2e/e2e-values-shift.yaml

@@ -22,7 +22,7 @@ package:
     ref: quay.io/coreos/olm:local
     pullPolicy: Always
   service:
-    internalPort: 443
+    internalPort: 5443
   commandArgs: -test.coverprofile=/tmp/catalog-coverage.cov
 
 e2e:

test/e2e/e2e-values.yaml

@@ -24,7 +24,7 @@ package:
     ref: quay.io/coreos/olm:local
     pullPolicy: IfNotPresent
   service:
-    internalPort: 443
+    internalPort: 5443
   commandArgs: -test.coverprofile=/tmp/catalog-coverage.cov
 
 e2e:

upstream.Dockerfile

@@ -15,7 +15,7 @@ COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-man
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
 EXPOSE 8080
-EXPOSE 443
+EXPOSE 5443
 CMD ["/bin/olm"]
 
 FROM quay.io/coreos/alm-ci:base