Enable globalnet E2E matrix

Signed-off-by: Miguel Angel Ajo <majopela@redhat.com>

Makefile

@@ -22,8 +22,9 @@ e2e: E2E_ARGS=cluster1 cluster2
 preload-images:
 	source $(SCRIPTS_DIR)/lib/debug_functions; \
 	source $(SCRIPTS_DIR)/lib/deploy_funcs; \
+	source $(SCRIPTS_DIR)/lib/version; \
 	set -e; \
-	for image in submariner-gateway submariner-route-agent submariner-operator lighthouse-agent submariner-globalnet lighthouse-coredns; do \
+	for image in submariner submariner-route-agent submariner-operator lighthouse-agent submariner-globalnet lighthouse-coredns; do \
 		import_image quay.io/submariner/$${image}; \
 	done
 

submariner-operator/crds/crd.yaml

@@ -105,7 +105,7 @@ spec:
               type: string
             colorCodes:
               type: string
-            gatewayDaemonSetStatus:
+            engineDaemonSetStatus:
               properties:
                 lastResourceVersion:
                   type: string

submariner-operator/templates/NOTES.txt

@@ -1,6 +1,6 @@
 Submariner is now installed.
 
-{{- if .Values.gateway.nodeSelectorEnabled }}
+{{- if .Values.engine.nodeSelectorEnabled }}
 If you haven't done so yet, please label a node as `submariner.io/gateway=true` to elect it for running Submariner.
 {{- end }}
 

submariner-operator/templates/_helpers.tpl

@@ -43,13 +43,13 @@ Create the name of the submariner-operator service account to use
 {{- end -}}
 
 {{/*
-Create the name of the submariner-gateway service account to use
+Create the name of the submariner-engine service account to use
 */}}
-{{- define "submariner.gatewayServiceAccountName" -}}
+{{- define "submariner.engineServiceAccountName" -}}
-{{- if .Values.serviceAccounts.gateway.create -}}
+{{- if .Values.serviceAccounts.engine.create -}}
-    {{ default "submariner-gateway" .Values.serviceAccounts.gateway.name }}
+    {{ default "submariner-engine" .Values.serviceAccounts.engine.name }}
 {{- else -}}
-    {{ default "default" .Values.serviceAccounts.gateway.name }}
+    {{ default "default" .Values.serviceAccounts.engine.name }}
 {{- end -}}
 {{- end -}}
 

submariner-operator/templates/operator-deployment.yaml

@@ -6,7 +6,7 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.fullname" . }}
-    component: gateway
+    component: engine
   name: {{ template "submariner.fullname" . }}
 spec:
   progressDeadlineSeconds: 600

submariner-operator/templates/rbac.yaml

@@ -86,7 +86,7 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -166,7 +166,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -175,10 +175,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
 subjects:
 - kind: ServiceAccount
-  name: {{ template "submariner.gatewayServiceAccountName" . }}
+  name: {{ template "submariner.engineServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -458,7 +458,7 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -525,7 +525,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -534,10 +534,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
 subjects:
   - kind: ServiceAccount
-    name: {{ template "submariner.gatewayServiceAccountName" . }}
+    name: {{ template "submariner.engineServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1

submariner-operator/templates/svc-acct.yaml

@@ -10,11 +10,11 @@ metadata:
     app: {{ template "submariner.name" . }}
 {{- end }}
 ---
-{{- if .Values.serviceAccounts.gateway.create }}
+{{- if .Values.serviceAccounts.engine.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "submariner.gatewayServiceAccountName" . }}
+  name: {{ template "submariner.engineServiceAccountName" . }}
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}

submariner-operator/values.yaml

@@ -37,15 +37,15 @@ operator:
   resources: {}
   tolerations: []
   affinity: {}
-gateway:
+engine:
   image:
-    repository: quay.io/submariner/submariner-gateway
+    repository: quay.io/submariner/submariner
     tag: "0.7.0"
 serviceAccounts:
   operator:
     create: true
     name: ""
-  gateway:
+  engine:
     create: true
     name: ""
   routeAgent:

submariner/questions.yml

@@ -1,22 +1,22 @@
 questions:
-- variable: defaultGatewayImage
+- variable: defaultEngineImage
   default: true
-  description: "Use default Submariner Gateway image or specify a custom one"
+  description: "Use default Submariner Engine image or specify a custom one"
-  label: Use default submariner gateway image
+  label: Use default submariner engine image
   type: boolean
   show_subquestion_if: false
   group: "Container Images"
   subquestions:
-  - variable: gateway.image.repository
+  - variable: engine.image.repository
-    default: "quay.io/submariner/submariner-gateway"
+    default: "quay.io/submariner/submariner"
-    description: "Submariner Gateway Image Repository"
+    description: "Submariner Engine Image Repository"
     type: string
-    label: Submariner Gateway Image Repository
+    label: Submariner Engine Image Repository
-  - variable: gateway.image.tag
+  - variable: engine.image.tag
     default: "0.6.0"
-    description: "Submariner Gateway Image Tag"
+    description: "Submariner Engine Image Tag"
     type: string
-    label: Submariner Gateway Image Tag
+    label: Submariner Engine Image Tag
 - variable: defaultRouteAgentImage
   default: true
   description: "Use default Submariner Route Agent image or specify a custom one"
@@ -35,7 +35,7 @@ questions:
     description: "Submariner Route Agent Image Tag"
     type: string
     label: Submariner Route Agent Image Tag
-- variable: gateway.nodeSelectorEnabled
+- variable: engine.nodeSelectorEnabled
   default: true
   description: "Restrict submariner to nodes labeled with submariner.io/gateway=true"
   label: Restrict gateway deployments to specific nodes

submariner/templates/NOTES.txt

@@ -1,6 +1,6 @@
 Submariner is now installed.
 
-{{- if .Values.gateway.nodeSelectorEnabled }}
+{{- if .Values.engine.nodeSelectorEnabled }}
 If you haven't done so yet, please label a node as `submariner.io/gateway=true` to elect it for running Submariner.
 {{- end }}
 

submariner/templates/_helpers.tpl

@@ -32,13 +32,13 @@ Create chart name and version as used by the chart label.
 {{- end -}}
 
 {{/*
-Create the name of the submariner-gateway service account to use
+Create the name of the submariner-engine service account to use
 */}}
-{{- define "submariner.gatewayServiceAccountName" -}}
+{{- define "submariner.engineServiceAccountName" -}}
-{{- if .Values.serviceAccounts.gateway.create -}}
+{{- if .Values.serviceAccounts.engine.create -}}
-    {{ default "submariner-gateway" .Values.serviceAccounts.gateway.name }}
+    {{ default "submariner-engine" .Values.serviceAccounts.engine.name }}
 {{- else -}}
-    {{ default "default" .Values.serviceAccounts.gateway.name }}
+    {{ default "default" .Values.serviceAccounts.engine.name }}
 {{- end -}}
 {{- end -}}
 

submariner/templates/engine-deploy.yaml

@@ -5,14 +5,14 @@ metadata:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.fullname" . }}-gateway
+    app: {{ template "submariner.fullname" . }}-engine
-    component: gateway
+    component: engine
   name: {{ template "submariner.fullname" . }}-gateway
 spec:
   revisionHistoryLimit: 5
   selector:
     matchLabels:
-      app: {{ template "submariner.fullname" . }}-gateway
+      app: {{ template "submariner.fullname" . }}-engine
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 1
@@ -21,7 +21,7 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        app: {{ template "submariner.fullname" . }}-gateway
+        app: {{ template "submariner.fullname" . }}-engine
     spec:
       affinity:
         podAntiAffinity:
@@ -31,19 +31,19 @@ spec:
               - key: app
                 operator: In
                 values:
-                - {{ template "submariner.fullname" . }}-gateway
+                - {{ template "submariner.fullname" . }}-engine
             topologyKey: "kubernetes.io/hostname"
-{{- with .Values.gateway.affinity }}
+{{- with .Values.engine.affinity }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       nodeSelector:
-{{- if .Values.gateway.nodeSelectorEnabled }}
+{{- if .Values.engine.nodeSelectorEnabled }}
         submariner.io/gateway: "true"
 {{- end }}
-{{- with .Values.gateway.nodeSelector }}
+{{- with .Values.engine.nodeSelector }}
 {{ toYaml . | indent 8 }}
 {{- end }}
-{{- with .Values.gateway.tolerations }}
+{{- with .Values.engine.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
 {{- end }}
@@ -112,11 +112,11 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: "spec.nodeName"
-        image: {{ .Values.gateway.image.repository }}:{{ default .Chart.AppVersion .Values.gateway.image.tag }}
+        image: {{ .Values.engine.image.repository }}:{{ default .Chart.AppVersion .Values.engine.image.tag }}
-        imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.engine.image.pullPolicy }}
         name: submariner
         resources:
-{{ toYaml .Values.gateway.resources | indent 10 }}
+{{ toYaml .Values.engine.resources | indent 10 }}
         securityContext:
           allowPrivilegeEscalation: true
           capabilities:
@@ -135,4 +135,4 @@ spec:
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 1
-      serviceAccountName: {{ template "submariner.gatewayServiceAccountName" . }}
+      serviceAccountName: {{ template "submariner.engineServiceAccountName" . }}

submariner/templates/rbac.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -82,7 +82,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -91,10 +91,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
 subjects:
   - kind: ServiceAccount
-    name: {{ template "submariner.gatewayServiceAccountName" . }}
+    name: {{ template "submariner.engineServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -299,7 +299,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -366,7 +366,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -375,10 +375,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:gateway
+  name: {{ template "submariner.fullname" . }}:engine
 subjects:
   - kind: ServiceAccount
-    name: {{ template "submariner.gatewayServiceAccountName" . }}
+    name: {{ template "submariner.engineServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1

submariner/templates/svc-acct.yaml

@@ -1,8 +1,8 @@
-{{- if .Values.serviceAccounts.gateway.create }}
+{{- if .Values.serviceAccounts.engine.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "submariner.gatewayServiceAccountName" . }}
+  name: {{ template "submariner.engineServiceAccountName" . }}
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}

submariner/values.yaml

@@ -29,9 +29,9 @@ leadership:
   leaseDuration: 10
   renewDeadline: 5
   retryPeriod: 2
-gateway:
+engine:
   image:
-    repository: quay.io/submariner/submariner-gateway
+    repository: quay.io/submariner/submariner
     tag: ""
     pullPolicy: IfNotPresent
   resources: {}
@@ -65,7 +65,7 @@ lighthouseCoredns:
     tag: ""
     pullPolicy: IfNotPresent
 serviceAccounts:
-  gateway:
+  engine:
     create: true
     name: ""
   routeAgent: