From 198c46980596bba18d33ed1288c0c18c3a9ef205 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 22 Aug 2023 18:01:46 +0200 Subject: [PATCH 1/2] Fix multiarch image build Signed-off-by: Damien Grisonnet --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 378d25ed..0140d73c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +ARG ARCH ARG GO_VERSION FROM golang:${GO_VERSION} as build @@ -14,7 +15,7 @@ COPY Makefile Makefile ARG ARCH 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 / USER 65534 From a4100f047a5e2cdd0bd1c7689aae861c45517821 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Thu, 24 Aug 2023 15:13:50 +0200 Subject: [PATCH 2/2] Cut release v0.11.1 Signed-off-by: Damien Grisonnet --- VERSION | 2 +- deploy/manifests/api-service.yaml | 2 +- .../manifests/cluster-role-aggregated-metrics-reader.yaml | 2 +- deploy/manifests/cluster-role-binding-delegator.yaml | 2 +- deploy/manifests/cluster-role-binding.yaml | 2 +- deploy/manifests/cluster-role-metrics-server-resources.yaml | 2 +- deploy/manifests/cluster-role.yaml | 2 +- deploy/manifests/config-map.yaml | 2 +- deploy/manifests/deployment.yaml | 6 +++--- deploy/manifests/network-policy.yaml | 2 +- deploy/manifests/pod-disruption-budget.yaml | 2 +- deploy/manifests/role-binding-auth-reader.yaml | 2 +- deploy/manifests/service-account.yaml | 2 +- deploy/manifests/service.yaml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index d9df1bbc..af88ba82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.11.0 +0.11.1 diff --git a/deploy/manifests/api-service.yaml b/deploy/manifests/api-service.yaml index bee44b4f..2ad7ac2b 100644 --- a/deploy/manifests/api-service.yaml +++ b/deploy/manifests/api-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-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 spec: group: metrics.k8s.io diff --git a/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml b/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml index 9feee9ae..c6adff6e 100644 --- a/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml +++ b/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-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-edit: "true" rbac.authorization.k8s.io/aggregate-to-view: "true" diff --git a/deploy/manifests/cluster-role-binding-delegator.yaml b/deploy/manifests/cluster-role-binding-delegator.yaml index dd68da33..d113af79 100644 --- a/deploy/manifests/cluster-role-binding-delegator.yaml +++ b/deploy/manifests/cluster-role-binding-delegator.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-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 namespace: monitoring roleRef: diff --git a/deploy/manifests/cluster-role-binding.yaml b/deploy/manifests/cluster-role-binding.yaml index d48ed240..d60a3878 100644 --- a/deploy/manifests/cluster-role-binding.yaml +++ b/deploy/manifests/cluster-role-binding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring roleRef: diff --git a/deploy/manifests/cluster-role-metrics-server-resources.yaml b/deploy/manifests/cluster-role-metrics-server-resources.yaml index b46e2d2e..a63a034c 100644 --- a/deploy/manifests/cluster-role-metrics-server-resources.yaml +++ b/deploy/manifests/cluster-role-metrics-server-resources.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-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 rules: - apiGroups: diff --git a/deploy/manifests/cluster-role.yaml b/deploy/manifests/cluster-role.yaml index c09b91d5..a6aa5170 100644 --- a/deploy/manifests/cluster-role.yaml +++ b/deploy/manifests/cluster-role.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter rules: - apiGroups: diff --git a/deploy/manifests/config-map.yaml b/deploy/manifests/config-map.yaml index aa0b38fb..289b77d0 100644 --- a/deploy/manifests/config-map.yaml +++ b/deploy/manifests/config-map.yaml @@ -48,6 +48,6 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: adapter-config namespace: monitoring diff --git a/deploy/manifests/deployment.yaml b/deploy/manifests/deployment.yaml index 4e0562c0..9246ab00 100644 --- a/deploy/manifests/deployment.yaml +++ b/deploy/manifests/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring spec: @@ -22,7 +22,7 @@ spec: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 spec: automountServiceAccountToken: true containers: @@ -33,7 +33,7 @@ spec: - --prometheus-url=https://prometheus.monitoring.svc:9090/ - --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 - image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.0 + image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.1 livenessProbe: failureThreshold: 5 httpGet: diff --git a/deploy/manifests/network-policy.yaml b/deploy/manifests/network-policy.yaml index 3df2e761..c9fbb65e 100644 --- a/deploy/manifests/network-policy.yaml +++ b/deploy/manifests/network-policy.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring spec: diff --git a/deploy/manifests/pod-disruption-budget.yaml b/deploy/manifests/pod-disruption-budget.yaml index 8e58c0b2..158c93cb 100644 --- a/deploy/manifests/pod-disruption-budget.yaml +++ b/deploy/manifests/pod-disruption-budget.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring spec: diff --git a/deploy/manifests/role-binding-auth-reader.yaml b/deploy/manifests/role-binding-auth-reader.yaml index 93477080..9f7f5b0a 100644 --- a/deploy/manifests/role-binding-auth-reader.yaml +++ b/deploy/manifests/role-binding-auth-reader.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-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 namespace: kube-system roleRef: diff --git a/deploy/manifests/service-account.yaml b/deploy/manifests/service-account.yaml index 8a2746c7..123ae8af 100644 --- a/deploy/manifests/service-account.yaml +++ b/deploy/manifests/service-account.yaml @@ -5,6 +5,6 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring diff --git a/deploy/manifests/service.yaml b/deploy/manifests/service.yaml index 98f81e9c..9e6e1d41 100644 --- a/deploy/manifests/service.yaml +++ b/deploy/manifests/service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter - app.kubernetes.io/version: 0.11.0 + app.kubernetes.io/version: 0.11.1 name: prometheus-adapter namespace: monitoring spec: