Merge pull request #193 from openshift-cherrypick-robot/cherry-pick-1…

…91-to-release-4.3 [release-4.3] add configurable endpoint publishing strategy scope
openshift · Apr 27, 2020 · bc493d4 · bc493d4
2 parents 7a817a7 + ed4f26f
commit bc493d4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/assets/cluster-bootstrap/cluster-ingresscontrollers-02-config.yaml b/assets/cluster-bootstrap/cluster-ingresscontrollers-02-config.yaml
@@ -4,6 +4,12 @@ metadata:
   name: default
   namespace: openshift-ingress-operator
 spec:
+{{ if .EndpointPublishingStrategyScope }}
+  endpointPublishingStrategy:
+    loadBalancer:
+      scope: {{ .EndpointPublishingStrategyScope }}
+    type: LoadBalancerService
+{{ end }}
   nodePlacement:
     tolerations:
     - key: dedicated

diff --git a/cluster.yaml.example b/cluster.yaml.example
@@ -17,6 +17,7 @@ originReleasePrefix: quay.io/openshift-release-dev
 apiNodePort: 32323
 openVPNNodePort: 32324
 ingressSubdomain: apps.hosted.example.com
+endpointPublishingStrategyScope: External
 openshiftAPIClusterIP: 172.30.0.20
 baseDomain: example.com
 networkType: OpenShiftSDN

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -51,6 +51,7 @@ type ClusterParams struct {
 	ApiserverLivenessPath               string                 `json:"apiserverLivenessPath"`
 	DefaultFeatureGates                 []string
 	PlatformType                        string `json:"platformType"`
+	EndpointPublishingStrategyScope     string `json:"endpointPublishingStrategyScope"`
 }
 
 type NamedCert struct {

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go