Merge branch 'master' into enable-auth

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-shift.yaml

@@ -2,6 +2,8 @@ rbacApiVersion: authorization.openshift.io
 namespace: local
 watchedNamespaces: local
 catalog_namespace: local
+debug: true
+
 alm:
   replicaCount: 1
   image:

Documentation/install/local-values.yaml

@@ -2,6 +2,7 @@ rbacApiVersion: rbac.authorization.k8s.io
 namespace: local
 watchedNamespaces: local
 catalog_namespace: local
+debug: true
 
 olm:
   replicaCount: 1
@@ -25,7 +26,7 @@ package:
     ref: quay.io/coreos/olm:local
     pullPolicy: IfNotPresent
   service:
-    internalPort: 443
+    internalPort: 5443
 
 catalog_sources:
  - rh-operators

deploy/chart/templates/0000_30_10-olm-operator.deployment.yaml

@@ -29,6 +29,9 @@ spec:
           {{- if .Values.olm.commandArgs }}
           - {{ .Values.olm.commandArgs }}
           {{- end }}
+          {{- if .Values.debug }}
+          - -debug
+          {{- end }}
           image: {{ .Values.olm.image.ref }}
           imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
           ports:

deploy/chart/templates/0000_30_11-catalog-operator.deployment.yaml

@@ -28,7 +28,9 @@ spec:
           {{- end }}
           - '-namespace'
           - {{ .Values.catalog_namespace }}
+          {{- if .Values.debug }}
           - '-debug'
+          {{- end }}
           {{- if .Values.catalog.commandArgs }}
           - {{ .Values.catalog.commandArgs }}
           {{- end }}

deploy/chart/templates/0000_30_13-packageserver.yaml

@@ -112,7 +112,9 @@ spec:
         - --secure-port={{ .Values.package.service.internalPort }}
         - --global-namespace
         - {{ .Values.namespace }}
+        {{- if .Values.debug }}
         - --debug
+        {{- end }}
         {{- if .Values.package.commandArgs }}
         - {{ .Values.package.commandArgs }}
         {{- end }}

deploy/chart/values.yaml

@@ -2,6 +2,7 @@ rbacApiVersion: rbac.authorization.k8s.io
 namespace: operator-lifecycle-manager
 catalog_namespace: operator-lifecycle-manager
 imagestream: false
+debug: false
 olm:
   replicaCount: 1
   image:

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",
 					},