Skip to content

Commit f797530

Browse files
committed
update kruise-api to 1.5.0
Signed-off-by: 守辰 <[email protected]>
1 parent b081f2a commit f797530

File tree

2,823 files changed

+478
-961677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,823 files changed

+478
-961677
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ on:
1212

1313
env:
1414
# Common versions
15-
GO_VERSION: '1.16'
16-
GOLANGCI_VERSION: 'v1.42'
15+
GO_VERSION: '1.18'
16+
GOLANGCI_VERSION: 'v1.51'
1717

1818
jobs:
1919

2020
golangci-lint:
21-
runs-on: ubuntu-18.04
21+
runs-on: ubuntu-20.04
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v2
@@ -35,16 +35,13 @@ jobs:
3535
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
3636
restore-keys: ${{ runner.os }}-go-
3737
- name: Lint golang code
38-
uses: golangci/golangci-lint-action@v2
38+
uses: golangci/golangci-lint-action@v3.5.0
3939
with:
4040
version: ${{ env.GOLANGCI_VERSION }}
4141
args: --verbose
42-
skip-pkg-cache: true
43-
mod: readonly
44-
4542
ci-build:
4643
name: ci-build
47-
runs-on: ubuntu-18.04
44+
runs-on: ubuntu-20.04
4845
steps:
4946
- name: Checkout
5047
uses: actions/checkout@v2

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17 as builder
1+
FROM golang:1.18 as builder
22

33
WORKDIR /workspace
44
# Copy the Go Modules manifests

README.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,36 @@ Prometheus client endpoint. You can also open `/metrics` in a browser to see
2222
the raw metrics. Note that the metrics exposed on the `/metrics` endpoint
2323
reflect the current state of OpenKruise objects in the Kubernetes cluster.
2424
When the objects are deleted they are no longer visible on the `/metrics` endpoint.
25+
26+
# Installation
27+
28+
## Install with helm
29+
30+
kruise-state-metrics can be simply installed by helm v3.5+, which is a simple command-line tool and you can get it from [here](https://github.com/helm/helm/releases).
31+
32+
```bash
33+
# Firstly add openkruise charts repository if you haven't do this.
34+
$ helm repo add openkruise https://openkruise.github.io/charts/
35+
36+
# [Optional]
37+
$ helm repo update
38+
39+
# Install the latest version.
40+
$ helm install openkruise/kruise-state-metrics --version 0.1.0
41+
```
42+
43+
## Optional: download charts manually
44+
45+
If you have problem with connecting to `https://openkruise.github.io/charts/` in production, you might need to download the chart from [here](https://github.com/openkruise/charts/releases) manually and install or upgrade with it.
46+
47+
```bash
48+
$ helm install/upgrade kruise-state-metrics /PATH/TO/CHART
49+
```
50+
51+
# Metrics Documentation
52+
See the [`docs`](docs) directory for more information on the exposed metrics.
53+
54+
# Usage
55+
See the [`examples`](examples) directory for example grafana dashboard that use metrics exposed by kruise-state-metrics
56+
57+

go.mod

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,68 @@
11
module github.com/openkruise/kruise-state-metrics
22

3-
go 1.16
3+
go 1.18
44

55
require (
6-
github.com/google/go-cmp v0.5.5
7-
github.com/imdario/mergo v0.3.12 // indirect
8-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
6+
github.com/google/go-cmp v0.5.9
97
github.com/oklog/run v1.1.0
10-
github.com/openkruise/kruise-api v1.0.0
8+
github.com/openkruise/kruise-api v1.5.0
119
github.com/pkg/errors v0.9.1
1210
github.com/prometheus/client_golang v1.11.0
1311
github.com/prometheus/common v0.30.0
1412
github.com/prometheus/exporter-toolkit v0.6.1
15-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
16-
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
17-
golang.org/x/text v0.3.7 // indirect
18-
google.golang.org/appengine v1.6.7 // indirect
19-
k8s.io/api v0.22.1
20-
k8s.io/apimachinery v0.22.1
13+
k8s.io/api v0.24.16
14+
k8s.io/apimachinery v0.24.16
2115
k8s.io/autoscaler/vertical-pod-autoscaler v0.9.2
22-
k8s.io/client-go v0.22.1
23-
k8s.io/klog/v2 v2.10.0
16+
k8s.io/client-go v0.24.0
17+
k8s.io/klog/v2 v2.80.1
2418
k8s.io/kube-state-metrics/v2 v2.2.1
25-
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect
19+
)
20+
21+
require (
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
24+
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/dgryski/go-jump v0.0.0-20170409065014-e1f439676b57 // indirect
26+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
27+
github.com/go-kit/log v0.1.0 // indirect
28+
github.com/go-logfmt/logfmt v0.5.0 // indirect
29+
github.com/go-logr/logr v1.2.3 // indirect
30+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
31+
github.com/go-openapi/jsonreference v0.20.0 // indirect
32+
github.com/go-openapi/swag v0.19.14 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/golang/protobuf v1.5.2 // indirect
35+
github.com/google/gnostic v0.5.7-v3refs // indirect
36+
github.com/google/gofuzz v1.1.0 // indirect
37+
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/josharian/intern v1.0.0 // indirect
39+
github.com/jpillora/backoff v1.0.0 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
41+
github.com/mailru/easyjson v0.7.6 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
43+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44+
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46+
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
47+
github.com/prometheus/client_model v0.2.0 // indirect
48+
github.com/prometheus/procfs v0.6.0 // indirect
49+
github.com/spf13/pflag v1.0.5 // indirect
50+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
51+
golang.org/x/net v0.8.0 // indirect
52+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
53+
golang.org/x/sys v0.6.0 // indirect
54+
golang.org/x/term v0.6.0 // indirect
55+
golang.org/x/text v0.8.0 // indirect
56+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
57+
google.golang.org/appengine v1.6.7 // indirect
58+
google.golang.org/protobuf v1.28.1 // indirect
59+
gopkg.in/inf.v0 v0.9.1 // indirect
60+
gopkg.in/yaml.v2 v2.4.0 // indirect
61+
gopkg.in/yaml.v3 v3.0.1 // indirect
62+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
63+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
64+
sigs.k8s.io/gateway-api v0.4.3 // indirect
65+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
66+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
67+
sigs.k8s.io/yaml v1.3.0 // indirect
2668
)

0 commit comments

Comments
 (0)