From 8353ba17f3117a6ffbea1c9467bb5a08a379e8ee Mon Sep 17 00:00:00 2001 From: gavinfish Date: Wed, 23 Oct 2019 14:19:40 +0800 Subject: [PATCH] Update setenv --- infra/ansible/setenv.yaml | 20 ++++++++++++++++++-- infra/kube/secrets/production-registry.yaml | 8 -------- infra/kube/secrets/staging-registry.yaml | 8 -------- 3 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 infra/kube/secrets/production-registry.yaml delete mode 100644 infra/kube/secrets/staging-registry.yaml diff --git a/infra/ansible/setenv.yaml b/infra/ansible/setenv.yaml index eb4a61c68..69ef54c73 100644 --- a/infra/ansible/setenv.yaml +++ b/infra/ansible/setenv.yaml @@ -15,8 +15,24 @@ - name: Create staging ACR secret k8s: state: present - src: ../kube/secrets/production-registry.yaml + definition: + apiVersion: v1 + kind: Secret + metadata: + name: acr-secret + namespace: staging + data: + .dockerconfigjson: "{{ lookup('env', 'ACR_SECRET') }}" + type: kubernetes.io/dockerconfigjson - name: Create production ACR secret k8s: state: present - src: ../kube/secrets/staging-registry.yaml + definition: + apiVersion: v1 + kind: Secret + metadata: + name: acr-secret + namespace: production + data: + .dockerconfigjson: "{{ lookup('env', 'ACR_SECRET') }}" + type: kubernetes.io/dockerconfigjson diff --git a/infra/kube/secrets/production-registry.yaml b/infra/kube/secrets/production-registry.yaml deleted file mode 100644 index ebb7e9d86..000000000 --- a/infra/kube/secrets/production-registry.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: acr-secret - namespace: production -data: - .dockerconfigjson: "{{ lookup('env', 'ACR_SECRET') }}" -type: kubernetes.io/dockerconfigjson diff --git a/infra/kube/secrets/staging-registry.yaml b/infra/kube/secrets/staging-registry.yaml deleted file mode 100644 index eddc74ba0..000000000 --- a/infra/kube/secrets/staging-registry.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: acr-secret - namespace: staging -data: - .dockerconfigjson: "{{ lookup('env', 'ACR_SECRET') }}" -type: kubernetes.io/dockerconfigjson