Handle upgrade from metrics server 0.2.x to 0.3.x

rancher · Oct 4, 2018 · 22dc192 · 22dc192
1 parent 496d1a4
commit 22dc192
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/cluster/addons.go b/cluster/addons.go
@@ -44,6 +44,7 @@ type MetricsServerOptions struct {
 	RBACConfig         string
 	Options            map[string]string
 	MetricsServerImage string
+	Version            string
 }
 
 type addonError struct {
@@ -204,10 +205,14 @@ func (c *Cluster) deployKubeDNS(ctx context.Context) error {
 
 func (c *Cluster) deployMetricServer(ctx context.Context) error {
 	log.Infof(ctx, "[addons] Setting up Metrics Server")
+	s := strings.Split(c.SystemImages.MetricsServer, ":")
+	versionTag := s[len(s)-1]
+
 	MetricsServerConfig := MetricsServerOptions{
 		MetricsServerImage: c.SystemImages.MetricsServer,
 		RBACConfig:         c.Authorization.Mode,
 		Options:            c.Monitoring.Options,
+		Version:            getTagMajorVersion(versionTag),
 	}
 	metricsYaml, err := addons.GetMetricsServerManifest(MetricsServerConfig)
 	if err != nil {

diff --git a/templates/metrics.go b/templates/metrics.go
@@ -113,7 +113,13 @@ spec:
         imagePullPolicy: Always
         command:
         - /metrics-server
+        {{- if eq .Version "v0.3" }}
+        - --kubelet-insecure-tls
+        - --kubelet-preferred-address-types=InternalIP
+        - --logtostderr
+        {{- else }}
         - --source=kubernetes.summary_api:https://kubernetes.default.svc?kubeletHttps=true&kubeletPort=10250&useServiceAccount=true&insecure=true
+        {{- end }}
         {{ range $k,$v := .Options }}
         -  --{{ $k }}={{ $v }}
         {{ end }}