From 4e86d6ae341fe1e0a60a7b55f71d4c8ee284526d Mon Sep 17 00:00:00 2001 From: Henry Agnew Date: Tue, 27 Apr 2021 10:31:48 -0700 Subject: [PATCH] Reverted changes to metrics API. Retain API registration changes Testing indicates that metrics API v1beta2 is not a suitable drop-in replacement for v1beta1, and v1 does not exist at this time. Signed-off-by: Henry Agnew --- docs/custom-metrics-apiservice.yaml | 4 ++-- docs/external-metrics-apiservice.yaml | 4 ++-- docs/helm/templates/custom-metrics-apiservice.yaml | 4 ++-- docs/helm/templates/external-metrics-apiservice.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/custom-metrics-apiservice.yaml b/docs/custom-metrics-apiservice.yaml index 81bea91..bc9669b 100644 --- a/docs/custom-metrics-apiservice.yaml +++ b/docs/custom-metrics-apiservice.yaml @@ -1,13 +1,13 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: - name: v1.custom.metrics.k8s.io + name: v1beta1.custom.metrics.k8s.io spec: service: name: kube-metrics-adapter namespace: kube-system group: custom.metrics.k8s.io - version: v1 + version: v1beta1 insecureSkipTLSVerify: true groupPriorityMinimum: 100 versionPriority: 100 diff --git a/docs/external-metrics-apiservice.yaml b/docs/external-metrics-apiservice.yaml index eba21d1..45160fb 100644 --- a/docs/external-metrics-apiservice.yaml +++ b/docs/external-metrics-apiservice.yaml @@ -1,13 +1,13 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: - name: v1.external.metrics.k8s.io + name: v1beta1.external.metrics.k8s.io spec: service: name: kube-metrics-adapter namespace: kube-system group: external.metrics.k8s.io - version: v1 + version: v1beta1 insecureSkipTLSVerify: true groupPriorityMinimum: 100 versionPriority: 100 diff --git a/docs/helm/templates/custom-metrics-apiservice.yaml b/docs/helm/templates/custom-metrics-apiservice.yaml index 74a0b23..06aa184 100644 --- a/docs/helm/templates/custom-metrics-apiservice.yaml +++ b/docs/helm/templates/custom-metrics-apiservice.yaml @@ -2,13 +2,13 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: - name: v1.custom.metrics.k8s.io + name: v1beta1.custom.metrics.k8s.io spec: service: name: kube-metrics-adapter namespace: {{ .Values.namespace }} group: custom.metrics.k8s.io - version: v1 + version: v1beta1 insecureSkipTLSVerify: {{ .Values.tls.skipTLSVerify }} groupPriorityMinimum: 100 versionPriority: 100 diff --git a/docs/helm/templates/external-metrics-apiservice.yaml b/docs/helm/templates/external-metrics-apiservice.yaml index e63f481..d83b3c3 100644 --- a/docs/helm/templates/external-metrics-apiservice.yaml +++ b/docs/helm/templates/external-metrics-apiservice.yaml @@ -2,13 +2,13 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: - name: v1.external.metrics.k8s.io + name: v1beta1.external.metrics.k8s.io spec: service: name: kube-metrics-adapter namespace: {{ .Values.namespace }} group: external.metrics.k8s.io - version: v1 + version: v1beta1 insecureSkipTLSVerify: {{ .Values.tls.skipTLSVerify }} groupPriorityMinimum: 100 versionPriority: 100