From 5b337f120cfed579f5cd17816059886268993e41 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 2 Dec 2014 11:32:45 -0800 Subject: [PATCH 1/3] Add some backward compatability for GKE. (cherry picked from commit b07515c5ea63624485fb8058c251cd4055a336f0) --- cluster/saltbase/salt/generate-cert/init.sls | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/cluster/saltbase/salt/generate-cert/init.sls b/cluster/saltbase/salt/generate-cert/init.sls index cfe53747b1e..78129a16413 100644 --- a/cluster/saltbase/salt/generate-cert/init.sls +++ b/cluster/saltbase/salt/generate-cert/init.sls @@ -43,3 +43,33 @@ 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 From 4cb55b015bf1f42a9da25dbf4c3f4a60a1959574 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 2 Dec 2014 12:53:44 -0800 Subject: [PATCH 2/3] Add 0.5.5 --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 6ce01015e8e..35824a2768d 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "5.4+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.5.4-dev" // version from git, output of $(git describe) + gitMinor string = "5.5" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.5.5" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 11be36d8e978a6bd2d944182697f5f03b0407584 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 2 Dec 2014 12:54:08 -0800 Subject: [PATCH 3/3] Add 0.5.5-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 35824a2768d..966ba88d77b 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "5.5" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.5.5" // version from git, output of $(git describe) + gitMinor string = "5.5+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.5.5-dev" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" )