Merge branch 'master' into dont-annotate-immediately

ecordell · web-flow · commit 36f6bbe81098 · 2018-10-17T18:10:02.000-04:00
diff --git a/deploy/chart/templates/0000_30_13-packageserver.yaml b/deploy/chart/templates/0000_30_13-packageserver.yaml
@@ -109,6 +109,7 @@ spec:
         - --watched-namespaces
         - {{ .Values.watchedNamespaces }}
         {{- end }}
+        - --secure-port={{ .Values.package.service.internalPort }}
         - --global-namespace
         - {{ .Values.namespace }}
         - --debug
@@ -154,6 +155,6 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: {{ .Values.package.service.internalPort }}
   selector:
     app: package-server
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
@@ -24,7 +24,7 @@ package:
     ref: quay.io/coreos/olm:master
     pullPolicy: Always
   service:
-    internalPort: 443
+    internalPort: 5443
 
 catalog_sources:
  - rh-operators
diff --git a/deploy/ocp/values.yaml b/deploy/ocp/values.yaml
@@ -22,7 +22,7 @@ package:
     ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
     pullPolicy: Always
   service:
-    internalPort: 443
+    internalPort: 5443
 catalog_sources:
 - rh-operators
-- certified-operators
+- certified-operators
diff --git a/deploy/okd/values.yaml b/deploy/okd/values.yaml
@@ -22,6 +22,6 @@ package:
     ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
     pullPolicy: Always
   service:
-    internalPort: 443
+    internalPort: 5443
 catalog_sources:
-- rh-operators
+- rh-operators
diff --git a/deploy/upstream/values.yaml b/deploy/upstream/values.yaml
@@ -22,6 +22,6 @@ package:
     ref: quay.io/coreos/olm@sha256:f3b170c8c1cd29c5452afd961e73bada7402623310290926c649cce0b4310470
     pullPolicy: Always
   service:
-    internalPort: 443
+    internalPort: 5443
 catalog_sources:
-- rh-operators
+- rh-operators
