refactor: globalnet should be under the broker

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

submariner/questions.yml

@@ -136,3 +136,9 @@ questions:
   group: "Advanced Configuration"
   description: "Cable driver implementation"
   label: "Cable Driver"
+- variable: submariner.serviceDiscovery
+  type: boolean
+  default: false
+  group: "Advanced Configuration"
+  description: "Enable multicluster service discovery"
+  label: "Service Discovery Enabled"

submariner/templates/globalnet.yaml

@@ -1,4 +1,4 @@
-{{- if ne .Values.submariner.globalCidr "" }}
+{{- if .Values.broker.globalnet }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

submariner/templates/lighthouse.yaml

@@ -30,7 +30,7 @@ spec:
           value: "{{ .Values.submariner.clusterId }}"
         - name: SUBMARINER_DEBUG
           value: "{{ .Values.submariner.debug }}"
-{{- if ne .Values.submariner.globalCidr "" }}
+{{- if .Values.broker.globalnet }}
         - name: SUBMARINER_GLOBALNET_ENABLED
           value: "true"
 {{- end }}

submariner/templates/rbac.yaml

@@ -195,7 +195,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:
@@ -463,7 +463,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/values.yaml

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