X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fchart_repo%2Ftemplates%2Fchart-repo.yml;h=465d77c830da9b2a863390e1b21d2742b9e493ec;hb=c190ad2e9b6bc698acb3d2e71c3f451454496c3e;hp=af4f5e8a775440725b9e241e269dfb0b3d729ffb;hpb=cf9e279cdad75e3bacaa71fb0323f1284288b73a;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 af4f5e8..465d77c 100644 --- a/ansible/roles/chart_repo/templates/chart-repo.yml +++ b/ansible/roles/chart_repo/templates/chart-repo.yml @@ -26,16 +26,10 @@ 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 @@ -45,13 +39,9 @@ spec: - name: chart-repo-handler image: {{ container_image_names | select('search', '/chartrepo') | list | last }} imagePullPolicy: IfNotPresent - ## Limits equals requets to put the container into qualified QoS category resources: - limits: - cpu: "0.2" - memory: "128Mi" requests: - cpu: "0.2" + cpu: "10m" memory: "128Mi" command: - "/usr/bin/mainstart.sh" @@ -65,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