refactor: globalnet should be under the broker

Signed-off-by: Steve Mattar <smattar@redhat.com>

submariner-operator/questions.yml

@@ -92,13 +92,26 @@ questions:
   label: "Service CIDR"
   group: "CIDR Configuration"
   required: true
-- variable: submariner.globalCidr
-  default: ""
-  description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
-  type: string
-  label: "Globalnet CIDR"
-  group: "CIDR Configuration"
-  required: false
+- variable: submariner.serviceDiscovery
+  type: boolean
+  default: false
+  group: "Advanced Configuration"
+  description: "Enable multicluster service discovery"
+  label: "Service Discovery Enabled"
+- variable: broker.globalnet
+  type: boolean
+  default: false
+  group: "Broker Configuration"
+  description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
+  label: "Globalnet Enabled"
+  subquestions:
+  - variable: submariner.globalCidr
+    default: ""
+    description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
+    type: string
+    label: "Globalnet CIDR"
+    group: "CIDR Configuration"
+    required: false
 - variable: submariner.natEnabled
   type: boolean
   default: false

submariner-operator/templates/rbac.yaml

@@ -279,7 +279,7 @@ subjects:
   name: {{ template "submariner.routeAgentServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
-{{- if ne .Values.submariner.globalCidr "" }}
+{{- if .Values.broker.globalnet }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -622,7 +622,7 @@ subjects:
     name: {{ template "submariner.routeAgentServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
-{{- if ne .Values.submariner.globalCidr "" }}
+{{- if .Values.broker.globalnet }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

submariner-operator/values.yaml

@@ -19,6 +19,7 @@ broker:
   namespace: xyz
   insecure: false
   ca: ""
+  globalnet: false
 rbac:
   create: true
 ipsec: