kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-05 17:27:51 +00:00
Code Issues Projects Releases Packages Activity Actions

Merge pull request #1 from kubernetes-sigs/master

Browse source 
update my dev brunch
This commit is contained in:
bogo 2023-08-29 15:32:10 +08:00 • committed by GitHub
commit fda3dad49b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -1,3 +1,4 @@
ARG ARCH
ARG GO_VERSION ARG GO_VERSION
FROM golang:${GO_VERSION} as build FROM golang:${GO_VERSION} as build
@ -14,7 +15,7 @@ COPY Makefile Makefile
ARG ARCH ARG ARCH
RUN make prometheus-adapter RUN make prometheus-adapter
FROM gcr.io/distroless/static:latest FROM gcr.io/distroless/static:latest-$ARCH
COPY --from=build /go/src/sigs.k8s.io/prometheus-adapter/adapter / COPY --from=build /go/src/sigs.k8s.io/prometheus-adapter/adapter /
USER 65534 USER 65534

2
VERSION
View file

@ -1 +1 @@
0.11.0 0.11.1

2
deploy/manifests/api-service.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: v1beta1.metrics.k8s.io name: v1beta1.metrics.k8s.io
spec: spec:
group: metrics.k8s.io group: metrics.k8s.io

2
deploy/manifests/cluster-role-aggregated-metrics-reader.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true" rbac.authorization.k8s.io/aggregate-to-view: "true"

2
deploy/manifests/cluster-role-binding-delegator.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: resource-metrics:system:auth-delegator name: resource-metrics:system:auth-delegator
namespace: monitoring namespace: monitoring
roleRef: roleRef:

2
deploy/manifests/cluster-role-binding.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring
roleRef: roleRef:

2
deploy/manifests/cluster-role-metrics-server-resources.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: resource-metrics-server-resources name: resource-metrics-server-resources
rules: rules:
- apiGroups: - apiGroups:

2
deploy/manifests/cluster-role.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
rules: rules:
- apiGroups: - apiGroups:

2
deploy/manifests/config-map.yaml
View file

@ -48,6 +48,6 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: adapter-config name: adapter-config
namespace: monitoring namespace: monitoring

6
deploy/manifests/deployment.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring
spec: spec:
@ -22,7 +22,7 @@ spec:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
spec: spec:
automountServiceAccountToken: true automountServiceAccountToken: true
containers: containers:
@ -33,7 +33,7 @@ spec:
- --prometheus-url=https://prometheus.monitoring.svc:9090/ - --prometheus-url=https://prometheus.monitoring.svc:9090/
- --secure-port=6443 - --secure-port=6443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.0 image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.1
livenessProbe: livenessProbe:
failureThreshold: 5 failureThreshold: 5
httpGet: httpGet:

2
deploy/manifests/network-policy.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring
spec: spec:

2
deploy/manifests/pod-disruption-budget.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring
spec: spec:

2
deploy/manifests/role-binding-auth-reader.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: resource-metrics-auth-reader name: resource-metrics-auth-reader
namespace: kube-system namespace: kube-system
roleRef: roleRef:

2
deploy/manifests/service-account.yaml
View file

@ -5,6 +5,6 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring

2
deploy/manifests/service.yaml
View file

@ -4,7 +4,7 @@ metadata:
labels: labels:
app.kubernetes.io/component: metrics-adapter app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/version: 0.11.0 app.kubernetes.io/version: 0.11.1
name: prometheus-adapter name: prometheus-adapter
namespace: monitoring namespace: monitoring
spec: spec: