Update versioning and image repositories (#44)

* Update versioning and image repositories

Update helm charts to follow the submariner versioning,
and include the image repositories by default.

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

* Update final version

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

submariner-k8s-broker/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 name: submariner-k8s-broker
-version: 0.0.2
+version: 0.4.1
-appVersion: v0.0.2
+appVersion: 0.4.1
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/

submariner/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner
-version: 0.0.4
+version: 0.4.0
-appVersion: v0.0.4
+appVersion: 0.4.0
-description: k8s 1.16.x support
+description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/
 sources:

submariner/templates/engine-deploy.yaml

@@ -108,7 +108,7 @@ spec:
           value: "{{ .Values.leadership.renewDeadline }}"
         - name: LEADERSHIP_RETRYPERIOD
           value: "{{ .Values.leadership.retryPeriod }}"
-        image: {{ .Values.engine.image.repository }}:{{ .Values.engine.image.tag }}
+        image: {{ .Values.engine.image.repository }}:{{ default .Chart.AppVersion .Values.engine.image.tag }}
         imagePullPolicy: {{ .Values.engine.image.pullPolicy }}
         name: submariner
         resources:

submariner/templates/globalnet.yaml

@@ -26,7 +26,7 @@ spec:
         submariner.io/gateway: 'true'
       containers:
         - name: {{ template "submariner.fullname" . }}-globalnet
-          image: {{ .Values.globalnet.image.repository }}:{{ .Values.globalnet.image.tag }}
+          image: {{ .Values.globalnet.image.repository }}:{{  default .Chart.AppVersion .Values.globalnet.image.tag }}
           imagePullPolicy: {{ .Values.globalnet.image.pullPolicy }}
           env:
             - name: SUBMARINER_CLUSTERID

submariner/templates/lighthouse-coredns.yaml

@@ -23,7 +23,7 @@ spec:
         - args:
             - -conf
             - /etc/coredns/Corefile
-          image: {{ .Values.lighthouseCoredns.image.repository }}:{{ .Values.lighthouseCoredns.image.tag }}
+          image: {{ .Values.lighthouseCoredns.image.repository }}:{{  default .Chart.AppVersion .Values.lighthouseCoredns.image.tag }}
           imagePullPolicy: {{ .Values.lighthouseCoredns.image.pullPolicy }}
           name: {{ template "submariner.lighthouseDnsName" . }}
           volumeMounts:

submariner/templates/lighthouse.yaml

@@ -48,7 +48,7 @@ spec:
           value: "{{ .Values.broker.ca }}"
 {{- end }}
         name: {{ template "submariner.fullname" . }}-lighthouse-agent
-        image: {{ .Values.lighthouse.image.repository }}:{{ .Values.lighthouse.image.tag }}
+        image: {{ .Values.lighthouse.image.repository }}:{{  default .Chart.AppVersion  .Values.lighthouse.image.tag }}
         imagePullPolicy: {{ .Values.lighthouse.image.pullPolicy }}
       restartPolicy: Always
       terminationGracePeriodSeconds: 0

submariner/templates/route-agent-ds.yaml

@@ -28,7 +28,7 @@ spec:
       - name: routeagent
         command:
         - submariner-route-agent.sh
-        image: {{ .Values.routeAgent.image.repository }}:{{ .Values.routeAgent.image.tag }}
+        image: {{ .Values.routeAgent.image.repository }}:{{  default .Chart.AppVersion .Values.routeAgent.image.tag }}
         imagePullPolicy: {{ .Values.routeAgent.image.pullPolicy }}
         env:
         - name: SUBMARINER_NAMESPACE

submariner/values.yaml

@@ -31,44 +31,38 @@ leadership:
   retryPeriod: 2
 engine:
   image:
-    repository: rancher/submariner
+    repository: quay.io/submariner/submariner
-    tag: v0.0.2
+    tag: ""
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   resources: {}
-    # limits:
-  # cpu: 100m
-  # memory: 100Mi
   nodeSelectorEnabled: true
   nodeSelector: {}
   tolerations: []
   affinity: {}
 routeAgent:
   image:
-    repository: rancher/submariner-route-agent
+    repository: quay.io/submariner/submariner-route-agent
-    tag: v0.0.2
+    tag: ""
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   resources: {}
-  # limits:
-  # cpu: 100m
-  # memory: 100Mi
   nodeSelector: {}
   tolerations: []
   affinity: {}
 globalnet:
   image:
-    repository: submariner-globalnet
+    repository: quay.io/submariner/submariner-globalnet
-    tag: local
+    tag: ""
     pullPolicy: IfNotPresent
 lighthouse:
   image:
-    repository: lighthouse-agent
+    repository: quay.io/submariner/lighthouse-agent
-    tag: local
+    tag: ""
     pullPolicy: IfNotPresent
 lighthouseCoredns:
   name: ""
   image:
-    repository: lighthouse-coredns
+    repository: quay.io/submariner/lighthouse-coredns
-    tag: local
+    tag: ""
     pullPolicy: IfNotPresent
 serviceAccounts:
   engine: