X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fchart_repo%2Ftemplates%2Fchart-repo.yml;h=9a111a737cf88d363c8bed428d1b70dd2e9068cb;hb=3a4ce452b8f989641a25ec7b539a704168f51858;hp=aacf6b7f9dc6d33226e3d85bacedf24e85bc94d3;hpb=863d4e265683ce662153bf9d793b91e85abd0dd0;p=ta%2Fcaas-helm.git

diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index aacf6b7..9a111a7 100644
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: chart-repo
@@ -26,20 +26,13 @@ spec:
       {{ caas.kubernetes_component_label }}: chart-repo
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         {{ caas.kubernetes_component_label }}: chart-repo
     spec:
       priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
       securityContext:
         runAsUser: {{ caas.uid.chartrepo }}
       containers:
@@ -62,7 +55,7 @@ spec:
             - name: CHARTREPOHANDLER_LISTENONINTERFACE
               value: "{{ caas.internal_flannel_interface }}"
             - name: CHARTREPOHANDLER_AUTHKEY
-              value: "{{ swift_pass.stdout }}"
+              value: "{{ caas.swift_credential.password }}"
             - name: CHARTREPOHANDLER_CONTAINER
               value: packages
             - name: CHARTREPOHANDLER_REPOURL
@@ -70,9 +63,9 @@ spec:
             - name: CHARTREPOHANDLER_INDEXPATH
               value: charts
             - name: CHARTREPOHANDLER_TLSCERTPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}.pem
+              value: /etc/chart-repo/ssl/chart-repo.pem
             - name: CHARTREPOHANDLER_TLSKEYPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}-key.pem
+              value: /etc/chart-repo/ssl/chart-repo-key.pem
             - name: CHARTREPOHANDLER_TLSCAPATH
               value: /etc/chart-repo/ssl/ca.pem
           volumeMounts: