Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release-1.6' into release-1.6
Browse files Browse the repository at this point in the history
* upstream/release-1.6: (90 commits)
  update documentation to reflect the latest release of kube-state-metrics
  *: Cut v1.6.0
  *: Cut v1.6.0-rc.2
  *: Cut v1.6.0-rc.1
  bump versions of prometheus,kubernetes, and addon-resizer
  use appsv1 apigroup for StatefulSets and DaemonSets
  use xenial dist in travis ci
  use a more idiomatic way of handling error messages
  fix: change the expectedType of the kube-client reflector to match the listWatch
  Add list/watch access to ClusterRole for CSR collector
  docs: minor improvements in kube-state-metrics README
  *: Cut v1.6.0
  README.md: Update compatibility matrix for kube-state-metrics v1.6
  pkg/metrics_store: Cache byte slices instead of strings
  internal/collector: Preallocate metric slice length when known upfront
  change unit test
  change unit test
  fmt unit test
  Add unit test Add “priority_class” in document
  Add label for priority class in kube_pod_info kubernetes#712
  ...
  • Loading branch information
paulfantom committed Jun 26, 2019
2 parents 2ab51c9 + a25b980 commit 0af7ecf
Show file tree
Hide file tree
Showing 1,478 changed files with 137,027 additions and 73,022 deletions.
18 changes: 18 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
run:
deadline: 2m

linters:
disable-all: true
enable:
- gofmt
- goimports
- golint
- gosimple
- gocyclo
- ineffassign
- misspell
- govet

linters-settings:
goimports:
local-prefixes: k8s.io/kube-state-metrics
29 changes: 25 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,43 @@
sudo: required

dist: xenial
language: go

go:
- "1.11.4"
- "1.12.x"

services:
- docker

git:
# Benchmark tests needs to access other branches, thereby we need to fetch all
# of the repository.
depth: false

env:
global:
- E2E_SETUP_MINIKUBE=yes
- E2E_SETUP_KUBECTL=yes
- E2E_SETUP_PROMTOOL=yes
- MINIKUBE_DRIVER=none
- SUDO=sudo

install:
- mkdir -p $HOME/gopath/src/k8s.io
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kube-state-metrics
- cd $HOME/gopath/src/k8s.io/kube-state-metrics

jobs:
include:
# Go fmt
- script: make gofmtcheck
# Lint
- script: make lint
# Check that all the go modules manifests, vendors, and packages are in sync
- script: make validate-modules
# Check that all metrics are documented
- script: make doccheck
# Unit Test
- script: make test-unit
# Benchmark Test
- script: make test-benchmark-compare
# Build
- script: make build
# E2e
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## v1.6.0 / 2019-05-06

After a testing period of 10 days (release candidate 2), there were no
additional bugs found, thus releasing the stable version v1.6.0.

* [FEATURE] Add `kube_replicaset_labels` to replicaset collector (#638).
* [FEATURE] Add ingresses collector (#640).
* [FEATURE] Add certificate signing request collector (#650).
* [FEATURE] Add `kube_persistentvolumeclaim_access_mode` metric (#673).
* [FEATURE] Add `kube_persistentvolume_capacity` metric (#674).
* [FEATURE] Add `kube_job_owner` metric (#681).
* [ENHANCEMENT] Add `priority_class` label to `kube_pod_info` metric (#713).
* [BUGFIX] Bump addon-resizer patch version reducing resource consumption (#724).
* [BUGFIX] Use k8s.io/api/apps/v1 for DaemonSet, Deployment and StatefulSet reflector (#720).

## v1.5.0 / 2019-01-10

After a testing period of 30 days, there were no additional bugs found or features introduced. Due to no bugs being reported over an in total 41 days period, we feel no more pre-releases are necessary for a stable release.
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
WORKDIR /go/src/k8s.io/kube-state-metrics
COPY . .
RUN make build
ENV GOFLAGS="-mod=vendor"
RUN make build-local

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
LABEL io.k8s.display-name="kube-state-metrics" \
Expand Down
76 changes: 0 additions & 76 deletions Documentation/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions Documentation/horizontalpodautoscaler-metrics.md

This file was deleted.

Loading

0 comments on commit 0af7ecf

Please sign in to comment.