Merge pull request #1323 from lilic/merge-2.0.0-beta

Merge release-2.0 into master branch
kubernetes · Dec 4, 2020 · 33db235 · 33db235
2 parents eba9142 + 1cc8230
commit 33db235
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v2.0.0-beta / 2020-12-04
+Promotion to beta release after a period of no bugs.
+
 ## v2.0.0-alpha.3 / 2020-11-19
 
 * [BUGFIX] Fix container resource limits metrics, which got dropped #1293

diff --git a/README.md b/README.md
@@ -70,8 +70,8 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
 |--------------------|---------------------|---------------------|----------------------|----------------------|----------------------|
 | **v1.8.0**         |         ✓           |         -           |          -           |          -           |          -           |
 | **v1.9.7**         |         -           |         ✓           |          -           |          -           |          -           |
-| **v2.0.0-alpha.3** |         -           |         -           |          -/✓         |         -/✓          |          ✓           |
-| **master**         |         -           |         -           |          -/✓         |          -/✓         |          ✓           |
+| **v2.0.0-beta**    |         -           |         -           |          -/✓         |         -/✓          |          ✓           |
+| **master**         |         -           |         -           |          -/✓         |         -/✓          |          ✓           |
 - `✓` Fully supported version range.
 - `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, deprecated APIs, etc).
 
@@ -86,8 +86,8 @@ release.
 #### Container Image
 
 The latest container image can be found at:
-* `quay.io/coreos/kube-state-metrics:v2.0.0-alpha.3` (arch: `amd64`)
-* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-alpha.3` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
+* `quay.io/coreos/kube-state-metrics:v2.0.0-beta` (arch: `amd64`)
+* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-beta` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
 
 ### Metrics Documentation
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0-alpha.3
+2.0.0-beta
diff --git a/examples/autosharding/cluster-role-binding.yaml b/examples/autosharding/cluster-role-binding.yaml
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/examples/autosharding/cluster-role.yaml b/examples/autosharding/cluster-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
 rules:
 - apiGroups:

diff --git a/examples/autosharding/role-binding.yaml b/examples/autosharding/role-binding.yaml
@@ -3,7 +3,7 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 roleRef:

diff --git a/examples/autosharding/role.yaml b/examples/autosharding/role.yaml
@@ -3,7 +3,7 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 rules:

diff --git a/examples/autosharding/service-account.yaml b/examples/autosharding/service-account.yaml
@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
diff --git a/examples/autosharding/service.yaml b/examples/autosharding/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 spec:

diff --git a/examples/autosharding/statefulset.yaml b/examples/autosharding/statefulset.yaml
@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 spec:
@@ -16,7 +16,7 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 2.0.0-alpha.3
+        app.kubernetes.io/version: 2.0.0-beta
     spec:
       containers:
       - args:
@@ -31,7 +31,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.3
+        image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-beta
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/examples/standard/cluster-role-binding.yaml b/examples/standard/cluster-role-binding.yaml
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/examples/standard/cluster-role.yaml b/examples/standard/cluster-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
 rules:
 - apiGroups:

diff --git a/examples/standard/deployment.yaml b/examples/standard/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 spec:
@@ -15,10 +15,10 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 2.0.0-alpha.3
+        app.kubernetes.io/version: 2.0.0-beta
     spec:
       containers:
-      - image: quay.io/coreos/kube-state-metrics:v2.0.0-alpha.3
+      - image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-beta
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/examples/standard/service-account.yaml b/examples/standard/service-account.yaml
@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
diff --git a/examples/standard/service.yaml b/examples/standard/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.0.0-alpha.3
+    app.kubernetes.io/version: 2.0.0-beta
   name: kube-state-metrics
   namespace: kube-system
 spec:

diff --git a/scripts/standard.jsonnet b/scripts/standard.jsonnet
@@ -5,5 +5,5 @@ ksm {
   name:: 'kube-state-metrics',
   namespace:: 'kube-system',
   version:: version,
-  image:: 'quay.io/coreos/kube-state-metrics:v' + version,
+  image:: 'k8s.gcr.io/kube-state-metrics/kube-state-metrics:v' + version,
 }
diff --git a/tests/e2e.sh b/tests/e2e.sh
@@ -26,6 +26,7 @@ esac
 KUBERNETES_VERSION=v1.19.1
 KUBE_STATE_METRICS_LOG_DIR=./log
 KUBE_STATE_METRICS_IMAGE_NAME="quay.io/coreos/kube-state-metrics-${ARCH}"
+KUBE_STATE_METRICS_CURRENT_IMAGE_NAME="k8s.gcr.io/kube-state-metrics/kube-state-metrics"
 E2E_SETUP_KIND=${E2E_SETUP_KIND:-}
 E2E_SETUP_KUBECTL=${E2E_SETUP_KUBECTL:-}
 KIND_VERSION=v0.9.0
@@ -105,7 +106,7 @@ echo "local kube-state-metrics image tag: $KUBE_STATE_METRICS_IMAGE_TAG"
 kind load docker-image "${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}"
 
 # update kube-state-metrics image tag in deployment.yaml
-sed -i.bak "s|${KUBE_STATE_METRICS_IMAGE_NAME%-*}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/standard/deployment.yaml
+sed -i.bak "s|${KUBE_STATE_METRICS_CURRENT_IMAGE_NAME}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/standard/deployment.yaml
 cat ./examples/standard/deployment.yaml
 
 trap finish EXIT