Update os-ingress-controller helm chart

lingxiankong · Oct 16, 2018 · f0bb40a · f0bb40a
1 parent 0b58e87
commit f0bb40a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/helm/openstack-ingress-controller/Chart.yaml b/helm/openstack-ingress-controller/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1"
 name: openstack-ingress-controller
 description: A Helm chart for OpenStack ingress controller
-version: 0.1.0
+version: 0.2.0
 home: https://github.com/kubernetes/cloud-provider-openstack
 sources:
   - https://github.com/kubernetes/cloud-provider-openstack

diff --git a/helm/openstack-ingress-controller/README.md b/helm/openstack-ingress-controller/README.md
@@ -2,7 +2,9 @@
 
 1. Prepare your customized values file like the following:
 
-    ```yaml
+    ```shell
+    cat <<EOF > myvals.yaml
+    clusterName: mycluster
     openstack:
       username: demo
       password: password
@@ -11,12 +13,13 @@
       region: RegionOne
       lbSubnetID: 100a129c-8f53-47fa-adf8-9f04849cb00b
       lbFipNetwork: a5d4e91c-7982-4b0a-8122-ffb3b38af42a
+    EOF
     ```
 
 2. Install the chart using helm CLI.
 
     ```shell
-    helm install --name os-ingress-controller-1 \
+    helm install --name os-ingress-controller \
         -f myvals.yaml \
-        https://github.com/lingxiankong/kubernetes-study/releases/download/v0.1.0/openstack-ingress-controller-0.1.0.tgz
+        https://github.com/lingxiankong/kubernetes-study/releases/download/v0.2.0/openstack-ingress-controller-0.2.0.tgz
     ```
diff --git a/helm/openstack-ingress-controller/templates/configmap.yaml b/helm/openstack-ingress-controller/templates/configmap.yaml
@@ -4,7 +4,8 @@ metadata:
   name: {{ .Values.configmapName }}
   namespace: kube-system
 data:
-  ingress-openstack.yaml: |
+  openstack-ingress-controller.yaml: |
+    clusterName: {{ .Values.clusterName }}
     openstack:
         username: {{ .Values.openstack.username }}
         password: {{ .Values.openstack.password }}

diff --git a/helm/openstack-ingress-controller/templates/deployment.yaml b/helm/openstack-ingress-controller/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - /bin/octavia-ingress-controller
-            - --config=/etc/kubernetes/ingress-openstack.yaml
+            - --config=/etc/kubernetes/openstack-ingress-controller.yaml
           volumeMounts:
             - name: ingress-config
               mountPath: /etc/kubernetes

diff --git a/helm/openstack-ingress-controller/values.yaml b/helm/openstack-ingress-controller/values.yaml
@@ -5,9 +5,9 @@
 configmapName: "openstack-ingress-controller"
 image:
   repository: "k8scloudprovider/octavia-ingress-controller"
-  tag: "v0.2.0"
+  tag: "v0.3.0"
   pullPolicy: IfNotPresent
-
+clusterName: mycluster
 openstack:
   username:
   password: