Merge pull request #2721 from brendandburns/release-0.5

Release 0.5

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

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-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"
 )