X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fchart_repo%2Ftemplates%2Fchart-repo.yml;h=cef7bbdfc6e485641b1264899eb64ffa6e9ed1b8;hb=241b421f0d0968363d74925de8bfc056a4f5b2a5;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..cef7bbd 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,13 +26,6 @@ spec: {{ caas.kubernetes_component_label }}: chart-repo template: metadata: - annotations: - danm.k8s.io/interfaces: | - [ - { - "network":"flannel" - } - ] labels: {{ caas.kubernetes_component_label }}: chart-repo spec: @@ -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