Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1862404: Bump to v1.9.7 #31

Merged
merged 7 commits into from
Aug 17, 2020
Merged

Bug 1862404: Bump to v1.9.7 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b2b6f5
Fix VolumeAttachment API version mismatch: expected v1 but watching v…
May 6, 2020
3776bbf
*: cut 1.9.6 release
tariq1890 May 6, 2020
f749759
switch mutatingwebhookconfiguration to v1
tariq1890 May 24, 2020
f8e013c
*: cut 1.9.7 release
tariq1890 May 24, 2020
b3fa585
Merge pull request #1150 from kubernetes/pick-mwc-fix
k8s-ci-robot May 28, 2020
dcc0ed7
Merge tag 'v1.9.7' into openshift-1.9.7-bump
brancz Jul 28, 2020
e1d836b
Merge pull request #30 from brancz/openshift-1.9.7-bump
openshift-merge-robot Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## v1.9.7 / 2020-05-24

* [BUGFIX] internal/store/mutatingwebhookconfiguration.go: Switch to v1 #1144

## v1.9.6 / 2020-05-06

* [BUGFIX] Fix VolumeAttachment API version mismatch: expected v1 but watching v1beta1 #1136

## v1.9.5 / 2020-02-20

* [BUGFIX] Switch to using only v1 client of validatingwebhookconfiguration #1052
Expand Down
17 changes: 9 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@ All additional compatibility is only best effort, or happens to still/already be
#### Compatibility matrix
At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kubernetes/kubernetes/releases) will be recorded below.

| kube-state-metrics | **Kubernetes 1.13** | **Kubernetes 1.14** | **Kubernetes 1.15** | **Kubernetes 1.16** | **Kubernetes 1.17** |
|--------------------|---------------------|---------------------|----------------------|----------------------|----------------------|
| **v1.6.0** | ✓ | - | - | - | - |
| **v1.7.2** | ✓ | ✓ | - | - | - |
| **v1.8.0** | ✓ | ✓ | ✓ | - | - |
| **v1.9.5** | ✓ | ✓ | ✓ | ✓ | ✓ |
| kube-state-metrics | **Kubernetes 1.12** | **Kubernetes 1.13** | **Kubernetes 1.14** | **Kubernetes 1.15** | **Kubernetes 1.16** |
|--------------------|---------------------|---------------------|---------------------|----------------------|----------------------|
| **v1.5.0** | ✓ | - | - | - | - |
| **v1.6.0** | ✓ | ✓ | - | - | - |
| **v1.7.2** | ✓ | ✓ | ✓ | - | - |
| **v1.8.0** | ✓ | ✓ | ✓ | ✓ | - |
| **v1.9.7** | ✓ | ✓ | ✓ | ✓ | ✓ |
| **master** | ✓ | ✓ | ✓ | ✓ | ✓ |
- `✓` Fully supported version range.
- `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, etc).
Expand All @@ -78,8 +79,8 @@ release.
#### Container Image

The latest container image can be found at:
* `quay.io/coreos/kube-state-metrics:v1.9.5`
* `k8s.gcr.io/kube-state-metrics:v1.9.5`
* `quay.io/coreos/kube-state-metrics:v1.9.7`
* `k8s.gcr.io/kube-state-metrics:v1.9.7`

**Note**:
The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.5
1.9.7
2 changes: 1 addition & 1 deletion examples/autosharding/cluster-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion examples/autosharding/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion examples/autosharding/role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion examples/autosharding/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Role
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
rules:
Expand Down
2 changes: 1 addition & 1 deletion examples/autosharding/service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
2 changes: 1 addition & 1 deletion examples/autosharding/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/autosharding/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: StatefulSet
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
spec:
Expand All @@ -16,7 +16,7 @@ spec:
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
spec:
containers:
- args:
Expand All @@ -33,7 +33,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/coreos/kube-state-metrics:v1.9.5
image: quay.io/coreos/kube-state-metrics:v1.9.7
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion examples/standard/cluster-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion examples/standard/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
rules:
- apiGroups:
Expand Down
6 changes: 3 additions & 3 deletions examples/standard/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
spec:
Expand All @@ -15,10 +15,10 @@ spec:
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
spec:
containers:
- image: quay.io/coreos/kube-state-metrics:v1.9.5
- image: quay.io/coreos/kube-state-metrics:v1.9.7
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion examples/standard/service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
2 changes: 1 addition & 1 deletion examples/standard/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/version: v1.9.5
app.kubernetes.io/version: v1.9.7
name: kube-state-metrics
namespace: kube-system
spec:
Expand Down
6 changes: 3 additions & 3 deletions internal/store/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
admissionregistration "k8s.io/api/admissionregistration/v1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
appsv1 "k8s.io/api/apps/v1"
autoscaling "k8s.io/api/autoscaling/v2beta1"
batchv1 "k8s.io/api/batch/v1"
Expand Down Expand Up @@ -239,7 +239,7 @@ func (b *Builder) buildLimitRangeStore() cache.Store {
}

func (b *Builder) buildMutatingWebhookConfigurationStore() cache.Store {
return b.buildStoreFunc(mutatingWebhookConfigurationMetricFamilies, &admissionregistration.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
return b.buildStoreFunc(mutatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
}

func (b *Builder) buildNamespaceStore() cache.Store {
Expand Down Expand Up @@ -303,7 +303,7 @@ func (b *Builder) buildCsrStore() cache.Store {
}

func (b *Builder) buildValidatingWebhookConfigurationStore() cache.Store {
return b.buildStoreFunc(validatingWebhookConfigurationMetricFamilies, &admissionregistration.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
return b.buildStoreFunc(validatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
}

func (b *Builder) buildVolumeAttachmentStore() cache.Store {
Expand Down
16 changes: 8 additions & 8 deletions internal/store/mutatingwebhookconfiguration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package store

import (
admissionregistration "k8s.io/api/admissionregistration/v1beta1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
Expand All @@ -37,7 +37,7 @@ var (
Name: "kube_mutatingwebhookconfiguration_info",
Type: metric.Gauge,
Help: "Information about the MutatingWebhookConfiguration.",
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -51,7 +51,7 @@ var (
Name: "kube_mutatingwebhookconfiguration_created",
Type: metric.Gauge,
Help: "Unix creation timestamp.",
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
ms := []*metric.Metric{}

if !mwc.CreationTimestamp.IsZero() {
Expand All @@ -68,7 +68,7 @@ var (
Name: "kube_mutatingwebhookconfiguration_metadata_resource_version",
Type: metric.Gauge,
Help: "Resource version representing a specific version of the MutatingWebhookConfiguration.",
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
return &metric.Family{
Metrics: resourceVersionMetric(mwc.ObjectMeta.ResourceVersion),
}
Expand All @@ -80,17 +80,17 @@ var (
func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
return &cache.ListWatch{
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().List(opts)
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(opts)
},
WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Watch(opts)
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(opts)
},
}
}

func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistration.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
return func(obj interface{}) *metric.Family {
mutatingWebhookConfiguration := obj.(*admissionregistration.MutatingWebhookConfiguration)
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.MutatingWebhookConfiguration)

metricFamily := f(mutatingWebhookConfiguration)

Expand Down
6 changes: 3 additions & 3 deletions internal/store/mutatingwebhookconfiguration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package store
import (
"testing"

admissionregistration "k8s.io/api/admissionregistration/v1beta1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

generator "k8s.io/kube-state-metrics/pkg/metric_generator"
Expand All @@ -31,7 +31,7 @@ func TestMutatingWebhookConfigurationStore(t *testing.T) {

cases := []generateMetricsTestCase{
{
Obj: &admissionregistration.MutatingWebhookConfiguration{
Obj: &admissionregistrationv1.MutatingWebhookConfiguration{
ObjectMeta: metav1.ObjectMeta{
Name: "mutatingwebhookconfiguration1",
Namespace: "ns1",
Expand All @@ -49,7 +49,7 @@ func TestMutatingWebhookConfigurationStore(t *testing.T) {
MetricNames: []string{"kube_mutatingwebhookconfiguration_info", "kube_mutatingwebhookconfiguration_metadata_resource_version"},
},
{
Obj: &admissionregistration.MutatingWebhookConfiguration{
Obj: &admissionregistrationv1.MutatingWebhookConfiguration{
ObjectMeta: metav1.ObjectMeta{
Name: "mutatingwebhookconfiguration2",
Namespace: "ns2",
Expand Down
12 changes: 6 additions & 6 deletions internal/store/validatingwebhookconfiguration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package store

import (
admissionregistration "k8s.io/api/admissionregistration/v1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
Expand All @@ -37,7 +37,7 @@ var (
Name: "kube_validatingwebhookconfiguration_info",
Type: metric.Gauge,
Help: "Information about the ValidatingWebhookConfiguration.",
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
return &metric.Family{
Metrics: []*metric.Metric{
{
Expand All @@ -51,7 +51,7 @@ var (
Name: "kube_validatingwebhookconfiguration_created",
Type: metric.Gauge,
Help: "Unix creation timestamp.",
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
ms := []*metric.Metric{}

if !vwc.CreationTimestamp.IsZero() {
Expand All @@ -68,7 +68,7 @@ var (
Name: "kube_validatingwebhookconfiguration_metadata_resource_version",
Type: metric.Gauge,
Help: "Resource version representing a specific version of the ValidatingWebhookConfiguration.",
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
return &metric.Family{
Metrics: resourceVersionMetric(vwc.ObjectMeta.ResourceVersion),
}
Expand All @@ -88,9 +88,9 @@ func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interfac
}
}

func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistration.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
return func(obj interface{}) *metric.Family {
mutatingWebhookConfiguration := obj.(*admissionregistration.ValidatingWebhookConfiguration)
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.ValidatingWebhookConfiguration)

metricFamily := f(mutatingWebhookConfiguration)

Expand Down
6 changes: 3 additions & 3 deletions internal/store/validatingwebhookconfiguration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package store
import (
"testing"

admissionregistration "k8s.io/api/admissionregistration/v1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

generator "k8s.io/kube-state-metrics/pkg/metric_generator"
Expand All @@ -31,7 +31,7 @@ func TestValidatingWebhookConfigurationStore(t *testing.T) {

cases := []generateMetricsTestCase{
{
Obj: &admissionregistration.ValidatingWebhookConfiguration{
Obj: &admissionregistrationv1.ValidatingWebhookConfiguration{
ObjectMeta: metav1.ObjectMeta{
Name: "validatingwebhookconfiguration1",
Namespace: "ns1",
Expand All @@ -49,7 +49,7 @@ func TestValidatingWebhookConfigurationStore(t *testing.T) {
MetricNames: []string{"kube_validatingwebhookconfiguration_info", "kube_validatingwebhookconfiguration_metadata_resource_version"},
},
{
Obj: &admissionregistration.ValidatingWebhookConfiguration{
Obj: &admissionregistrationv1.ValidatingWebhookConfiguration{
ObjectMeta: metav1.ObjectMeta{
Name: "validatingwebhookconfiguration2",
Namespace: "ns2",
Expand Down