From 6c42cb154bf149b597e76e5376103aff4904a419 Mon Sep 17 00:00:00 2001 From: Robert Bailey Date: Mon, 11 May 2015 10:07:53 -0700 Subject: [PATCH] Stop copying certs into /usr/share/nginx/ since nothing relies on that location any longer. --- cluster/saltbase/salt/generate-cert/init.sls | 30 -------------------- 1 file changed, 30 deletions(-) diff --git a/cluster/saltbase/salt/generate-cert/init.sls b/cluster/saltbase/salt/generate-cert/init.sls index 78129a16413..cfe53747b1e 100644 --- a/cluster/saltbase/salt/generate-cert/init.sls +++ b/cluster/saltbase/salt/generate-cert/init.sls @@ -43,33 +43,3 @@ kubernetes-cert: - user: root - group: root - shell: /bin/bash - -# These are introduced to ensure backwards compatability with older gcloud tools in GKE -kubernetes-old-key: - file.copy: - - name: /usr/share/nginx/kubecfg.key - - source: /srv/kubernetes/kubecfg.key - - makedirs: True - - preserve: True - - require: - - cmd: kubernetes-cert - - -kubernetes-old-cert: - file.copy: - - name: /usr/share/nginx/kubecfg.crt - - source: /srv/kubernetes/kubecfg.crt - - makedirs: True - - preserve: True - - require: - - cmd: kubernetes-cert - - -kubernetes-old-ca: - file.copy: - - name: /usr/share/nginx/ca.crt - - source: /srv/kubernetes/ca.crt - - makedirs: True - - preserve: True - - require: - - cmd: kubernetes-cert