diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 14f0eb67ee0..22b6f265648 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -14,29 +14,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0-beta.1 + name: heapster-v1.3.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0-beta.1 + version: v1.3.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: heapster livenessProbe: httpGet: @@ -56,7 +56,7 @@ spec: - name: usr-ca-certs mountPath: /usr/share/ca-certificates readOnly: true - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: eventer command: - /eventer @@ -94,7 +94,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -123,7 +123,7 @@ spec: - --memory={{base_eventer_memory}} - --extra-memory={{eventer_memory_per_node}}Ki - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 6c12dc57d34..3f1e861cc84 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -14,29 +14,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0-beta.1 + name: heapster-v1.3.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0-beta.1 + version: v1.3.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: heapster livenessProbe: httpGet: @@ -57,7 +57,7 @@ spec: - name: usr-ca-certs mountPath: /usr/share/ca-certificates readOnly: true - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: eventer command: - /eventer @@ -95,7 +95,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -124,7 +124,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 1bfa3cbf1dc..9f29285de28 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -14,29 +14,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0-beta.1 + name: heapster-v1.3.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0-beta.1 + version: v1.3.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: heapster livenessProbe: httpGet: @@ -49,7 +49,7 @@ spec: - /heapster - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: eventer command: - /eventer @@ -80,7 +80,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -109,7 +109,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 57bfb119785..148ee49d24d 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -12,29 +12,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0-beta.1 + name: heapster-v1.3.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0-beta.1 + version: v1.3.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0-beta.1 + version: v1.3.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 + - image: gcr.io/google_containers/heapster-amd64:v1.3.0 name: heapster livenessProbe: httpGet: @@ -71,7 +71,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0-beta.1 + - --deployment=heapster-v1.3.0 - --container=heapster - --poll-period=300000 - --estimator=exponential diff --git a/test/kubemark/resources/heapster_template.json b/test/kubemark/resources/heapster_template.json index cfedce9d0df..1d55467acfd 100644 --- a/test/kubemark/resources/heapster_template.json +++ b/test/kubemark/resources/heapster_template.json @@ -2,23 +2,23 @@ "kind": "ReplicationController", "apiVersion": "v1", "metadata": { - "name": "heapster-v1.3.0-beta.0", + "name": "heapster-v1.3.0", "labels": { "k8s-app": "heapster", - "version": "v1.3.0-beta.0" + "version": "v1.3.0" } }, "spec": { "replicas": 1, "selector": { "k8s-app": "heapster", - "version": "v1.3.0-beta.0" + "version": "v1.3.0" }, "template": { "metadata": { "labels": { "k8s-app": "heapster", - "version": "v1.3.0-beta.0" + "version": "v1.3.0" } }, "spec": { @@ -33,7 +33,7 @@ "containers": [ { "name": "heapster", - "image": "gcr.io/google_containers/heapster:v1.3.0-beta.0", + "image": "gcr.io/google_containers/heapster:v1.3.0", "resources": { "requests": { "cpu": "100m", @@ -55,7 +55,7 @@ }, { "name": "eventer", - "image": "gcr.io/google_containers/heapster:v1.3.0-beta.0", + "image": "gcr.io/google_containers/heapster:v1.3.0", "resources": { "requests": { "cpu": "100m",