Merge remote-tracking branch 'upstream/release-1.9' into bring-releas…

…es-1.9

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.9.5 / 2020-02-20
+
+* [BUGFIX] Switch to using only v1 client of validatingwebhookconfiguration #1052
+
 ## v1.9.4 / 2020-02-03
 
 * [BUGFIX] Fix VolumeAttachment api version to be used (was v1beta1, should have been v1). #1043

README.md

@@ -65,7 +65,7 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
 | **v1.6.0**         |         ✓           |         -           |          -           |          -           |          -           |
 | **v1.7.2**         |         ✓           |         ✓           |          -           |          -           |          -           |
 | **v1.8.0**         |         ✓           |         ✓           |          ✓           |          -           |          -           |
-| **v1.9.4**         |         ✓           |         ✓           |          ✓           |          ✓           |          -           |
+| **v1.9.5**         |         ✓           |         ✓           |          ✓           |          ✓           |          -           |
 | **master**         |         ✓           |         ✓           |          ✓           |          ✓           |          ✓           |
 - `✓` Fully supported version range.
 - `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, etc).
@@ -78,8 +78,8 @@ release.
 #### Container Image
 
 The latest container image can be found at:
-* `quay.io/coreos/kube-state-metrics:v1.9.4`
-* `k8s.gcr.io/kube-state-metrics:v1.9.4`
+* `quay.io/coreos/kube-state-metrics:v1.9.5`
+* `k8s.gcr.io/kube-state-metrics:v1.9.5`
 
 **Note**:
 The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on

VERSION

@@ -1 +1 @@
-1.9.4
+1.9.5

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: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

examples/autosharding/cluster-role.yaml

@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
 rules:
 - apiGroups:

examples/autosharding/role-binding.yaml

@@ -3,7 +3,7 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

examples/autosharding/role.yaml

@@ -3,7 +3,7 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
   namespace: kube-system
 rules:

examples/autosharding/service-account.yaml

@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
   namespace: kube-system

examples/autosharding/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
   namespace: kube-system
 spec:

examples/autosharding/statefulset.yaml

@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   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: 1.9.4
+        app.kubernetes.io/version: 1.9.5
     spec:
       containers:
       - args:
@@ -33,7 +33,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/coreos/kube-state-metrics:v1.9.4
+        image: quay.io/coreos/kube-state-metrics:v1.9.5
         livenessProbe:
           httpGet:
             path: /healthz

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: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

examples/standard/cluster-role.yaml

@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
 rules:
 - apiGroups:

examples/standard/deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   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: 1.9.4
+        app.kubernetes.io/version: 1.9.5
     spec:
       containers:
-      - image: quay.io/coreos/kube-state-metrics:v1.9.4
+      - image: quay.io/coreos/kube-state-metrics:v1.9.5
         livenessProbe:
           httpGet:
             path: /healthz

examples/standard/service-account.yaml

@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
   namespace: kube-system

examples/standard/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 1.9.4
+    app.kubernetes.io/version: 1.9.5
   name: kube-state-metrics
   namespace: kube-system
 spec:

internal/store/validatingwebhookconfiguration.go

@@ -17,7 +17,7 @@ limitations under the License.
 package store
 
 import (
-	admissionregistration "k8s.io/api/admissionregistration/v1beta1"
+	admissionregistration "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -80,10 +80,10 @@ var (
 func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return kubeClient.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().List(opts)
+			return kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().List(opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return kubeClient.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Watch(opts)
+			return kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().Watch(opts)
 		},
 	}
 }

internal/store/validatingwebhookconfiguration_test.go

@@ -19,7 +19,7 @@ package store
 import (
 	"testing"
 
-	admissionregistration "k8s.io/api/admissionregistration/v1beta1"
+	admissionregistration "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	generator "k8s.io/kube-state-metrics/pkg/metric_generator"

tests/e2e.sh

@@ -17,7 +17,7 @@
 set -e
 set -o pipefail
 
-KUBERNETES_VERSION=v1.15.3
+KUBERNETES_VERSION=v1.17.3
 KUBE_STATE_METRICS_LOG_DIR=./log
 KUBE_STATE_METRICS_IMAGE_NAME='quay.io/coreos/kube-state-metrics'
 PROMETHEUS_VERSION=2.12.0

tests/manifests/validatingwebhookconfiguration.yaml

@@ -1,4 +1,4 @@
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: example-validatingwebhookconfiguration
@@ -11,6 +11,9 @@ webhooks:
       namespace: apples
       path: /apple
     caBundle: "YXBwbGVz"
+  admissionReviewVersions: ["v1", "v1beta1"]
+  sideEffects: None
+  timeoutSeconds: 5
   namespaceSelector:
     matchExpressions:
     - key: production