update openelb v0.5.1

src/stable/openelb/Chart.yaml

@@ -1,12 +1,12 @@
 apiVersion: v2
-appVersion: 0.5.0
+appVersion: 0.5.1
 description: Bare Metal Load-balancer for Kubernetes Cluster
 icon: https://raw.githubusercontent.com/openelb/openelb/master/docs/logo/openelb-vertical.svg
 maintainers:
 - email: [email protected]
   name: KubeSphere
 name: openelb
-version: 0.5.0
+version: 0.5.1
 sources:
   - https://github.com/openelb/openelb
 type: application

src/stable/openelb/templates/configmap.yaml

@@ -0,0 +1,19 @@
+{{ if .Values.customImage.enable }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: openelb-images
+  namespace: {{ template "openelb.namespace" . }}
+data:
+  {{ if (ne .Values.customImage.forwardImage "") }}
+  forward-image: {{ .Values.customImage.forwardImage }}
+  {{ end }}
+
+  {{ if (ne .Values.customImage.proxyImage "") }}
+  proxy-image:  {{ .Values.customImage.proxyImage }}
+  {{ end }}
+
+  {{ if (ne .Values.customImage.vipImage "") }}
+  keepalived-vip-image: {{ .Values.customImage.vipImage }}
+  {{ end }}
+{{ end }}

src/stable/openelb/templates/manager-deployment.yaml

@@ -33,6 +33,10 @@ spec:
         args:
           - --webhook-port={{ .Values.manager.webhookPort }}
           - --api-hosts={{ .Values.manager.apiHosts }}
+          {{ if .Values.manager.monitorEnable }}
+          {{- $metricsAddr := cat ":" .Values.manager.monitorPort |toString -}}
+          - --metrics-addr={{- nospace $metricsAddr -}}
+          {{ end }}
         env:
           - name: NODE_NAME
             valueFrom:

src/stable/openelb/templates/manager-service.yaml

@@ -3,13 +3,18 @@ kind: Service
 metadata:
   name: {{ template "openelb.manager.fullname" . }}
   labels:
+    app: openelb-manager
   {{- include "openelb.manager.labels" . | nindent 4 }}
   namespace: {{ template "openelb.namespace" . }}
 spec:
+  selector:
+  {{- include "openelb.manager.labels" . | nindent 4 }}
   ports:
     - name: https-webhook
       port: 443
       targetPort: webhook
-  selector:
-  {{- include "openelb.manager.labels" . | nindent 4 }}
+      {{ if .Values.manager.monitorEnable }}
+    - port: {{ .Values.manager.monitorPort }}
+      name: metrics
+      {{ end }}
   type: ClusterIP

src/stable/openelb/templates/monitor.yaml

@@ -0,0 +1,24 @@
+{{ if .Values.manager.monitorEnable }}
+
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+  {{- include "openelb.manager.labels" . | nindent 4 }}
+  name: {{ template "openelb.manager.fullname" . }}
+  namespace: {{ template "openelb.namespace" . }}
+spec:
+  endpoints:
+    - path: /metrics
+      port: metrics
+      bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+      tlsConfig:
+        insecureSkipVerify: true
+  namespaceSelector:
+    matchNames:
+      - {{ template "openelb.namespace" . }}
+  selector:
+    matchLabels:
+      app: openelb-manager
+
+{{ end }}

src/stable/openelb/values.yaml

@@ -12,10 +12,12 @@ admission:
 
 manager:
   apiHosts: ":50051"
+  monitorEnable: false
+  monitorPort: 50052
   webhookPort: 443
   image:
     repository: kubesphere/openelb
-    tag: v0.5.0
+    tag: v0.5.1
     pullPolicy: IfNotPresent
   resources:
     limits:
@@ -36,3 +38,9 @@ manager:
   serviceAccount:
     create: true
     name: openelb-manager
+
+customImage:
+  enable: true
+  vipImage: ""      # "kubesphere/kube-keepalived-vip:0.35"
+  forwardImage: ""  # kubesphere/openelb-forward:master
+  proxyImage: ""    # kubesphere/openelb-proxy:master