Update dependencies

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>

.github/workflows/ci.yaml

@@ -0,0 +1,19 @@
+name: ci
+on: [push, pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-go@v2
+      with:
+        go-version: '^1.19'
+    - run: go version
+    - run: go install github.com/mattn/goveralls@latest
+    - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+    - run: make build.docker
+    - run: make test
+    - run: make check
+    - run: goveralls -coverprofile=profile.cov -service=github
+      env:
+        COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '29 17 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.gitignore

@@ -1,4 +1,5 @@
 build/
 apiserver.local.config/
 .idea/
+profile.cov
 vendor/

.golangci.yml

@@ -1,19 +1,15 @@
 run:
-linters-settings:
-  golint:
-      min-confidence: 0.9
+  concurrency: 4
 
 linters:
   disable-all: true
   enable:
-    - staticcheck
-    - ineffassign
-    - golint
-    - goimports
-    - errcheck
-issues:
-  exclude-rules:
-    # Exclude some staticcheck messages
-    - linters:
-        - staticcheck
-      text: "SA9003:"
+  - deadcode
+  - errcheck
+  - gosimple
+  - govet
+  - ineffassign
+  - staticcheck
+  - typecheck
+  - unused
+  - varcheck

.travis.yml

@@ -1,20 +0,0 @@
-language: go
-dist: xenial
-
-go:
-  - "1.14.x"
-
-env:
-- GO111MODULE=on GOLANGCI_RELEASE="v1.21.0"
-
-before_install:
-  - GO111MODULE=off go get github.com/mattn/goveralls
-  - GO111MODULE=off go get github.com/lawrencewoodman/roveralls
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_RELEASE}
-
-script:
-  - make test
-  - make build.docker
-  - make check
-  - roveralls
-  - goveralls -v -coverprofile=roveralls.coverprofile -service=travis-ci

Dockerfile

@@ -1,7 +1,11 @@
-FROM registry.opensource.zalan.do/stups/alpine:latest
-MAINTAINER Team Teapot @ Zalando SE <team-teapot@zalando.de>
+ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3.13:latest
+FROM ${BASE_IMAGE}
+LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
 
-# add binary
-ADD build/linux/kube-metrics-adapter /
+RUN apk add --no-cache tzdata
+
+ARG TARGETARCH
+
+ADD build/linux/${TARGETARCH}/kube-metrics-adapter /
 
 ENTRYPOINT ["/kube-metrics-adapter"]

Makefile

@@ -8,35 +8,66 @@ SOURCES       = $(shell find . -name '*.go')
 DOCKERFILE    ?= Dockerfile
 GOPKGS        = $(shell go list ./...)
 BUILD_FLAGS   ?= -v
+OPENAPI       ?= pkg/api/generated/openapi/zz_generated.openapi.go
 LDFLAGS       ?= -X main.version=$(VERSION) -w -s
+CRD_SOURCES    = $(shell find pkg/apis/zalando.org -name '*.go')
+CRD_TYPE_SOURCE = pkg/apis/zalando.org/v1/types.go
+GENERATED_CRDS = docs/scaling_schedules_crd.yaml
+GENERATED      = pkg/apis/zalando.org/v1/zz_generated.deepcopy.go
+
 
 default: build.local
 
 clean:
 	rm -rf build
+	rm -rf $(OPENAPI)
 
-test:
-	go test -v $(GOPKGS)
+test: $(GENERATED)
+	go test -v -coverprofile=profile.cov $(GOPKGS)
 
-check:
+check: $(GENERATED)
 	go mod download
 	golangci-lint run --timeout=2m ./...
 
-build.local: build/$(BINARY)
-build.linux: build/linux/$(BINARY)
-build.osx: build/osx/$(BINARY)
 
-build/$(BINARY): go.mod $(SOURCES)
+$(GENERATED): go.mod $(CRD_TYPE_SOURCE) $(OPENAPI)
+	./hack/update-codegen.sh
+
+$(GENERATED_CRDS): $(GENERATED) $(CRD_SOURCES)
+	go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs || /bin/true || true
+	mv docs/zalando.org_clusterscalingschedules.yaml docs/cluster_scaling_schedules_crd.yaml
+	mv docs/zalando.org_scalingschedules.yaml docs/scaling_schedules_crd.yaml
+
+$(OPENAPI): go.mod
+	go run k8s.io/kube-openapi/cmd/openapi-gen \
+		--go-header-file hack/boilerplate.go.txt \
+		--logtostderr \
+		-i k8s.io/metrics/pkg/apis/custom_metrics,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,k8s.io/metrics/pkg/apis/custom_metrics/v1beta2,k8s.io/metrics/pkg/apis/external_metrics,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,k8s.io/metrics/pkg/apis/metrics,k8s.io/metrics/pkg/apis/metrics/v1beta1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version,k8s.io/api/core/v1 \
+		-p pkg/api/generated/openapi \
+		-o . \
+		-O zz_generated.openapi \
+		-r /dev/null
+
+build.local: build/$(BINARY) $(GENERATED_CRDS)
+build.linux: build/linux/$(BINARY)
+build.linux.amd64: build/linux/amd64/$(BINARY)
+build.linux.arm64: build/linux/arm64/$(BINARY)
+
+
+build/$(BINARY): go.mod $(SOURCES) $(GENERATED)
 	CGO_ENABLED=0 go build -o build/$(BINARY) $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" .
 
-build/linux/$(BINARY): go.mod $(SOURCES)
+build/linux/$(BINARY): go.mod $(SOURCES) $(GENERATED)
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/linux/$(BINARY) -ldflags "$(LDFLAGS)" .
 
-build/osx/$(BINARY): go.mod $(SOURCES)
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/osx/$(BINARY) -ldflags "$(LDFLAGS)" .
+build/linux/amd64/$(BINARY): go.mod $(SOURCES)
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/linux/amd64/$(BINARY) -ldflags "$(LDFLAGS)" .
+
+build/linux/arm64/$(BINARY): go.mod $(SOURCES)
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/linux/arm64/$(BINARY) -ldflags "$(LDFLAGS)" .
 
 build.docker: build.linux
-	docker build --rm -t "$(IMAGE):$(TAG)" -f $(DOCKERFILE) .
+	docker build --rm -t "$(IMAGE):$(TAG)" -f $(DOCKERFILE) --build-arg TARGETARCH= .
 
 build.push: build.docker
 	docker push "$(IMAGE):$(TAG)"

delivery.yaml

@@ -1,7 +1,9 @@
 version: "2017-09-20"
 pipeline:
 - id: build
-  overlay: ci/golang
+  vm_config:
+    type: linux
+    image: "cdp-runtime/go"
   cache:
     paths:
     - /go/pkg/mod       # pkg cache for Go modules
@@ -28,3 +30,17 @@ pipeline:
       IMAGE=$IMAGE VERSION=$VERSION make build.docker
       git diff --stat --exit-code
       IMAGE=$IMAGE VERSION=$VERSION make build.push
+  - desc: Build and push image to Zalando's registry
+    cmd: |
+      if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
+        IMAGE=container-registry-test.zalando.net/teapot/kube-metrics-adapter
+        VERSION=$(git describe --tags --always)
+      else
+        IMAGE=container-registry-test.zalando.net/teapot/kube-metrics-adapter-test
+        VERSION=$CDP_BUILD_VERSION
+      fi
+      make build.linux.amd64 build.linux.arm64
+
+      docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
+      docker buildx build --rm --build-arg BASE_IMAGE=container-registry.zalando.net/library/alpine-3.13:latest -t "${IMAGE}:${VERSION}" --platform linux/amd64,linux/arm64 --push .
+      cdp-promote-image "${IMAGE}:${VERSION}"

docs/cluster_scaling_schedules_crd.yaml

@@ -0,0 +1,124 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.8.0
+  creationTimestamp: null
+  name: clusterscalingschedules.zalando.org
+spec:
+  group: zalando.org
+  names:
+    kind: ClusterScalingSchedule
+    listKind: ClusterScalingScheduleList
+    plural: clusterscalingschedules
+    singular: clusterscalingschedule
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ClusterScalingSchedule describes a cluster scoped time based
+          metric to be used in autoscaling operations.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScalingScheduleSpec is the spec part of the ScalingSchedule.
+            properties:
+              scalingWindowDurationMinutes:
+                description: Fade the scheduled values in and out over this many minutes.
+                  If unset, the default per-cluster value will be used.
+                format: int64
+                type: integer
+              schedules:
+                description: Schedules is the list of schedules for this ScalingSchedule
+                  resource. All the schedules defined here will result on the value
+                  to the same metric. New metrics require a new ScalingSchedule resource.
+                items:
+                  description: Schedule is the schedule details to be used inside
+                    a ScalingSchedule.
+                  properties:
+                    date:
+                      description: Defines the starting date of a OneTime schedule.
+                        It has to be a RFC3339 formated date.
+                      format: date-time
+                      type: string
+                    durationMinutes:
+                      description: The duration in minutes that the configured value
+                        will be returned for the defined schedule.
+                      type: integer
+                    period:
+                      description: Defines the details of a Repeating schedule.
+                      properties:
+                        days:
+                          description: The days that this schedule will be active.
+                          items:
+                            description: ScheduleDay represents the valid inputs for
+                              days in a SchedulePeriod.
+                            enum:
+                            - Sun
+                            - Mon
+                            - Tue
+                            - Wed
+                            - Thu
+                            - Fri
+                            - Sat
+                            type: string
+                          type: array
+                        startTime:
+                          description: The startTime has the format HH:MM
+                          pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
+                          type: string
+                        timezone:
+                          description: The location name corresponding to a file in
+                            the IANA Time Zone database, like Europe/Berlin.
+                          type: string
+                      required:
+                      - days
+                      - startTime
+                      - timezone
+                      type: object
+                    type:
+                      description: Defines if the schedule is a OneTime schedule or
+                        Repeating one. If OneTime, date has to be defined. If Repeating,
+                        Period has to be defined.
+                      enum:
+                      - OneTime
+                      - Repeating
+                      type: string
+                    value:
+                      description: The metric value that will be returned for the
+                        defined schedule.
+                      format: int64
+                      type: integer
+                  required:
+                  - durationMinutes
+                  - type
+                  - value
+                  type: object
+                type: array
+            required:
+            - schedules
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

docs/custom-metrics-apiservice.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiregistration.k8s.io/v1beta1
+apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1beta1.custom.metrics.k8s.io

docs/deployment.yaml

@@ -28,6 +28,7 @@ spec:
         - --prometheus-server=http://prometheus.kube-system.svc.cluster.local
         - --skipper-ingress-metrics
         - --aws-external-metrics
+        - --scaling-schedule
         env:
         - name: AWS_REGION
           value: eu-central-1

docs/external-metrics-apiservice.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiregistration.k8s.io/v1beta1
+apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1beta1.external.metrics.k8s.io

docs/helm/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: kube-metrics-adapter
+version: 0.1.18
+description: kube-metrics-adapter helm chart
+home: https://github.com/zalando-incubator/kube-metrics-adapter
+maintainers:
+  - name: The Zalando Incubator
+    email: opensource@zalando.de
+    url: https://github.com/zalando-incubator

docs/helm/templates/cluster_scaling_schedules_crd.yaml

@@ -0,0 +1,119 @@
+{{- if .Values.scalingSchedule.enabled }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: clusterscalingschedules.zalando.org
+spec:
+  group: zalando.org
+  names:
+    kind: ClusterScalingSchedule
+    listKind: ClusterScalingScheduleList
+    plural: clusterscalingschedules
+    singular: clusterscalingschedule
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ClusterScalingSchedule describes a cluster scoped time based
+          metric to be used in autoscaling operations.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScalingScheduleSpec is the spec part of the ScalingSchedule.
+            properties:
+              schedules:
+                description: Schedules is the list of schedules for this ScalingSchedule
+                  resource. All the schedules defined here will result on the value
+                  to the same metric. New metrics require a new ScalingSchedule resource.
+                items:
+                  description: Schedule is the schedule details to be used inside
+                    a ScalingSchedule.
+                  properties:
+                    date:
+                      description: Defines the starting date of a OneTime schedule.
+                        It has to be a RFC3339 formated date.
+                      format: date-time
+                      type: string
+                    durationMinutes:
+                      description: The duration in minutes that the configured value
+                        will be returned for the defined schedule.
+                      type: integer
+                    period:
+                      description: Defines the details of a Repeating schedule.
+                      properties:
+                        days:
+                          description: The days that this schedule will be active.
+                          items:
+                            description: ScheduleDay represents the valid inputs for
+                              days in a SchedulePeriod.
+                            enum:
+                            - Sun
+                            - Mon
+                            - Tue
+                            - Wed
+                            - Thu
+                            - Fri
+                            - Sat
+                            type: string
+                          type: array
+                        startTime:
+                          description: The startTime has the format HH:MM
+                          pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
+                          type: string
+                        timezone:
+                          description: The location name corresponding to a file in
+                            the IANA Time Zone database, like Europe/Berlin.
+                          type: string
+                      required:
+                      - days
+                      - startTime
+                      - timezone
+                      type: object
+                    type:
+                      description: Defines if the schedule is a OneTime schedule or
+                        Repeating one. If OneTime, date has to be defined. If Repeating,
+                        Period has to be defined.
+                      enum:
+                      - OneTime
+                      - Repeating
+                      type: string
+                    value:
+                      description: The metric value that will be returned for the
+                        defined schedule.
+                      type: integer
+                  required:
+                  - durationMinutes
+                  - type
+                  - value
+                  type: object
+                type: array
+            required:
+            - schedules
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
+{{- end}}

docs/helm/templates/custom-metrics-apiservice.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.enableCustomMetricsApi }}
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v1beta1.custom.metrics.k8s.io
+spec:
+  service:
+    name: kube-metrics-adapter
+    namespace: {{ .Values.namespace }}
+  group: custom.metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: {{ .Values.tls.skipTLSVerify }}
+  groupPriorityMinimum: 100
+  versionPriority: 100
+{{- end}}

docs/helm/templates/deployment.yaml

@@ -0,0 +1,209 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}
+  labels:
+    application: kube-metrics-adapter
+    version: {{ .Values.registry.imageTag }}
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      application: kube-metrics-adapter
+  template:
+    metadata:
+      labels:
+        application: kube-metrics-adapter
+        version: {{ .Values.registry.imageTag }}
+      {{- if .Values.podAnnotations }}
+      annotations: {{- toYaml .Values.podAnnotations | nindent 8 }}
+      {{- end }}
+    spec:
+      serviceAccountName: kube-metrics-adapter
+    {{- if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+    {{- end }}
+    {{- if .Values.tolerations }}
+      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
+    {{- end }}
+    {{- if .Values.affinity }}
+      affinity: {{ toYaml .Values.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
+    {{- end }}
+      containers:
+        - name: kube-metrics-adapter
+          image: {{ .Values.registry.image}}:{{ .Values.registry.imageTag }}
+          args:
+            {{- if .Values.addDirectoryHeader }}
+            - --add_dir_header={{ .Values.addDirectoryHeader }}
+            {{- end}}
+            {{- if .Values.log.alsoToStderr }}
+            - --alsologtostderr={{ .Values.log.alsoToStderr }}
+            {{- end}}
+            {{- if .Values.authentication.kubeConfig }}
+            - --authentication-kubeconfig={{ .Values.authentication.kubeConfig }}
+            {{- end}}
+            {{- if .Values.authentication.skipLookup }}
+            - --authentication-skip-lookup={{ .Values.authentication.skipLookup }}
+            {{- end}}
+            {{- if .Values.authentication.tokenWebhookCacheTtl }}
+            - --authentication-token-webhook-cache-ttl={{ .Values.authentication.tokenWebhookCacheTtl }}
+            {{- end}}
+            {{- if .Values.authentication.tolerateLookupFailure }}
+            - --authentication-tolerate-lookup-failure={{ .Values.authentication.tolerateLookupFailure }}
+            {{- end}}
+            {{- if .Values.authorization.alwaysAllowPaths }}
+            - --authorization-always-allow-paths={{ .Values.authorization.alwaysAllowPaths }}
+            {{- end}}
+            {{- if .Values.authorization.kubeConfig }}
+            - --authorization-kubeconfig={{ .Values.authorization.kubeConfig }}
+            {{- end}}
+            {{- if .Values.authorization.webhookCache.authorizedTtl }}
+            - --authorization-webhook-cache-authorized-ttl={{ .Values.authorization.webhookCache.authorizedTtl }}
+            {{- end}}
+            {{- if .Values.authorization.webhookCache.unauthorizedTtl }}
+            - --authorization-webhook-cache-unauthorized-ttl={{ .Values.authorization.webhookCache.unauthorizedTtl }}
+            {{- end}}
+            {{- if .Values.aws.externalMetrics }}
+            - --aws-external-metrics={{ .Values.aws.externalMetrics }}
+            {{- end}}
+            {{- if .Values.aws.region }}
+            - --aws-region={{ .Values.aws.region }}
+            {{- end}}
+            {{- if .Values.tls.certificateDirectory }}
+            - --cert-dir={{ .Values.tls.certificateDirectory }}
+            {{- end}}
+            {{- if .Values.tls.clientCaFile }}
+            - --client-ca-file={{ .Values.tls.clientCaFile }}
+            {{- end}}
+            {{- if .Values.contentionProfiling }}
+            - --contention-profiling={{ .Values.contentionProfiling }}
+            {{- end}}
+            {{- if .Values.credentialsDirectory }}
+            - --credentials-dir={{ .Values.credentialsDirectory }}
+            {{- end}}
+            {{- if .Values.disregardIncompatibleHPAs }}
+            - --disregard-incompatible-hpas={{ .Values.disregardIncompatibleHPAs }}
+            {{- end}}
+            {{- if .Values.enableCustomMetricsApi }}
+            - --enable-custom-metrics-api={{ .Values.enableCustomMetricsApi }}
+            {{- end}}
+            {{- if .Values.enableExternalMetricsApi }}
+            - --enable-external-metrics-api={{ .Values.enableExternalMetricsApi }}
+            {{- end}}
+            {{- if .Values.http2MaxStreamsPerConnection }}
+            - --http2-max-streams-per-connection={{ .Values.http2MaxStreamsPerConnection }}
+            {{- end}}
+            {{- if .Values.influxDB.address }}
+            - --influxdb-address={{ .Values.influxDB.address }}
+            {{- end}}
+            {{- if .Values.influxDB.organization }}
+            - --influxdb-org={{ .Values.influxDB.organization }}
+            {{- end}}
+            {{- if .Values.influxDB.token }}
+            - --influxdb-token={{ .Values.influxDB.token }}
+            {{- end}}
+            {{- if .Values.listerKubeConfig }}
+            - --lister-kubeconfig={{ .Values.listerKubeConfig }}
+            {{- end}}
+            {{- if .Values.log.flushFrequency }}
+            - --log-flush-frequency={{ .Values.log.flushFrequency }}
+            {{- end}}
+            {{- if .Values.log.backtraceAtTraceLocation }}
+            - --log_backtrace_at={{ .Values.log.backtraceAtTraceLocation }}
+            {{- end}}
+            {{- if .Values.log.directory }}
+            - --log_dir={{ .Values.log.directory }}
+            {{- end}}
+            {{- if .Values.log.file }}
+            - --log_file={{ .Values.log.file }}
+            {{- end}}
+            {{- if .Values.log.fileMaxSize }}
+            - --log_file_max_size={{ .Values.log.fileMaxSize }}
+            {{- end}}
+            {{- if .Values.log.toStderr }}
+            - --logtostderr={{ .Values.log.toStderr }}
+            {{- end}}
+            {{- if .Values.prometheus.metricsAddress }}
+            - --metrics-address={{ .Values.prometheus.metricsAddress }}
+            {{- end}}
+            {{- if .Values.profiling }}
+            - --profiling={{ .Values.profiling }}
+            {{- end}}
+            {{- if .Values.prometheus.server }}
+            - --prometheus-server={{ .Values.prometheus.server }}
+            {{- end}}
+            {{- if .Values.requestHeader.allowedNames }}
+            - --requestheader-allowed-names={{ .Values.requestHeader.allowedNames }}
+            {{- end}}
+            {{- if .Values.requestHeader.clientCaFile }}
+            - --requestheader-client-ca-file={{ .Values.requestHeader.clientCaFile }}
+            {{- end}}
+            {{- if .Values.requestHeader.extraHeadersPrefix }}
+            - --requestheader-extra-headers-prefix={{ .Values.requestHeader.extraHeadersPrefix }}
+            {{- end}}
+            {{- if .Values.requestHeader.groupHeaders }}
+            - --requestheader-group-headers={{ .Values.requestHeader.groupHeaders }}
+            {{- end}}
+            {{- if .Values.requestHeader.usernameHeaders }}
+            - --requestheader-username-headers={{ .Values.requestHeader.usernameHeaders }}
+            {{- end}}
+            - --secure-port={{ .Values.service.internalPort }}
+            {{- if .Values.log.skipHeaders }}
+            - --skip_headers={{ .Values.log.skipHeaders }}
+            {{- end}}
+            {{- if .Values.log.skipLogHeaders }}
+            - --skip_log_headers={{ .Values.log.skipLogHeaders }}
+            {{- end}}
+            {{- if .Values.skipperBackendsAnnotation }}
+            - --skipper-backends-annotation={{ .Values.skipperBackendsAnnotation }}
+            {{- end}}
+            {{- if .Values.skipperIngressMetrics }}
+            - --skipper-ingress-metrics={{ .Values.skipperIngressMetrics }}
+            {{- end}}
+            {{- if .Values.log.stderrThreshold }}
+            - --stderrthreshold={{ .Values.log.stderrThreshold }}
+            {{- end}}
+            {{- if .Values.tls.certFile }}
+            - --tls-cert-file={{ .Values.tls.certFile }}
+            {{- end}}
+            {{- if .Values.tls.cipherSuites }}
+            - --tls-cipher-suites={{ .Values.tls.cipherSuites }}
+            {{- end}}
+            {{- if .Values.tls.minVersion }}
+            - --tls-min-version={{ .Values.tls.minVersion }}
+            {{- end}}
+            {{- if .Values.tls.privateKeyFile }}
+            - --tls-private-key-file={{ .Values.tls.privateKeyFile }}
+            {{- end}}
+            {{- if .Values.tls.sniCertKey }}
+            - --tls-sni-cert-key={{ .Values.tls.sniCertKey }}
+            {{- end}}
+            {{- if .Values.token }}
+            - --token={{ .Values.token }}
+            {{- end}}
+            {{- if .Values.log.level }}
+            - --v={{ .Values.log.level }}
+            {{- end}}
+            {{- if .Values.vmodule }}
+            - --vmodule={{ .Values.vmodule }}
+            {{- end}}
+            {{- if .Values.zmon.kariosdbEndpoint }}
+            - --zmon-kariosdb-endpoint={{ .Values.zmon.kariosdbEndpoint }}
+            {{- end}}
+            {{- if .Values.zmon.tokenName }}
+            - --zmon-token-name={{ .Values.zmon.tokenName }}
+            {{- end}}
+            {{- if .Values.scalingSchedule.enabled }}
+            - --scaling-schedule
+            {{- end}}
+          resources:
+            limits:
+              cpu: {{ .Values.resources.limits.cpu }}
+              memory: {{ .Values.resources.limits.memory }}
+            requests:
+              cpu: {{ .Values.resources.requests.cpu }}
+              memory: {{ .Values.resources.requests.memory }}

docs/helm/templates/external-metrics-apiservice.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.enableExternalMetricsApi }}
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v1beta1.external.metrics.k8s.io
+spec:
+  service:
+    name: kube-metrics-adapter
+    namespace: {{ .Values.namespace }}
+  group: external.metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: {{ .Values.tls.skipTLSVerify }}
+  groupPriorityMinimum: 100
+  versionPriority: 100
+{{- end}}

docs/helm/templates/rbac.yaml

@@ -0,0 +1,165 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kube-metrics-adapter-server-resources
+rules:
+- apiGroups:
+  - custom.metrics.k8s.io
+  resources: ["*"]
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: external-metrics-server-resources
+rules:
+- apiGroups:
+  - external.metrics.k8s.io
+  resources: ["*"]
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kube-metrics-adapter-resource-reader
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  - pods
+  - services
+  - configmaps
+  verbs:
+  - get
+  - list
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kube-metrics-adapter-resource-collector
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - list
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - statefulsets
+  verbs:
+  - get
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs:
+  - get
+  - list
+  - watch
+{{- if .Values.scalingSchedule.enabled }}
+- apiGroups:
+  - zalando.org
+  resources:
+  - clusterscalingschedules
+  - scalingschedules
+  verbs:
+  - get
+  - list
+  - watch
+{{- end}}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: hpa-controller-custom-metrics
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-metrics-adapter-server-resources
+subjects:
+- kind: ServiceAccount
+  name: horizontal-pod-autoscaler
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: hpa-controller-external-metrics
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: external-metrics-server-resources
+subjects:
+- kind: ServiceAccount
+  name: horizontal-pod-autoscaler
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: kube-metrics-adapter-auth-reader
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: custom-metrics:system:auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: kube-metrics-adapter-resource-collector
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-metrics-adapter-resource-collector
+subjects:
+- kind: ServiceAccount
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: kube-metrics-adapter-resource-reader
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-metrics-adapter-resource-reader
+subjects:
+- kind: ServiceAccount
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}

docs/helm/templates/scaling_schedules_crd.yaml

@@ -0,0 +1,119 @@
+{{- if .Values.scalingSchedule.enabled }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: scalingschedules.zalando.org
+spec:
+  group: zalando.org
+  names:
+    kind: ScalingSchedule
+    listKind: ScalingScheduleList
+    plural: scalingschedules
+    singular: scalingschedule
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ScalingSchedule describes a namespaced time based metric to be
+          used in autoscaling operations.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScalingScheduleSpec is the spec part of the ScalingSchedule.
+            properties:
+              schedules:
+                description: Schedules is the list of schedules for this ScalingSchedule
+                  resource. All the schedules defined here will result on the value
+                  to the same metric. New metrics require a new ScalingSchedule resource.
+                items:
+                  description: Schedule is the schedule details to be used inside
+                    a ScalingSchedule.
+                  properties:
+                    date:
+                      description: Defines the starting date of a OneTime schedule.
+                        It has to be a RFC3339 formated date.
+                      format: date-time
+                      type: string
+                    durationMinutes:
+                      description: The duration in minutes that the configured value
+                        will be returned for the defined schedule.
+                      type: integer
+                    period:
+                      description: Defines the details of a Repeating schedule.
+                      properties:
+                        days:
+                          description: The days that this schedule will be active.
+                          items:
+                            description: ScheduleDay represents the valid inputs for
+                              days in a SchedulePeriod.
+                            enum:
+                            - Sun
+                            - Mon
+                            - Tue
+                            - Wed
+                            - Thu
+                            - Fri
+                            - Sat
+                            type: string
+                          type: array
+                        startTime:
+                          description: The startTime has the format HH:MM
+                          pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
+                          type: string
+                        timezone:
+                          description: The location name corresponding to a file in
+                            the IANA Time Zone database, like Europe/Berlin.
+                          type: string
+                      required:
+                      - days
+                      - startTime
+                      - timezone
+                      type: object
+                    type:
+                      description: Defines if the schedule is a OneTime schedule or
+                        Repeating one. If OneTime, date has to be defined. If Repeating,
+                        Period has to be defined.
+                      enum:
+                      - OneTime
+                      - Repeating
+                      type: string
+                    value:
+                      description: The metric value that will be returned for the
+                        defined schedule.
+                      type: integer
+                  required:
+                  - durationMinutes
+                  - type
+                  - value
+                  type: object
+                type: array
+            required:
+            - schedules
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
+{{- end}}

docs/helm/templates/service-account.yaml

@@ -0,0 +1,5 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}

docs/helm/templates/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: kube-metrics-adapter
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.internalPort }}
+  selector:
+    application: kube-metrics-adapter

docs/helm/values.yaml

@@ -0,0 +1,108 @@
+namespace: kube-system
+
+replicas: 1
+
+registry:
+  image: registry.opensource.zalan.do/teapot/kube-metrics-adapter
+  imageTag: v0.1.10
+  imagePullPolicy: IfNotPresent
+
+service:
+  port: 443
+  internalPort: 443
+
+addDirectoryHeader:
+contentionProfiling:
+profiling:
+enableCustomMetricsApi:
+enableExternalMetricsApi:
+credentialsDirectory:
+disregardIncompatibleHPAs:
+http2MaxStreamsPerConnection:
+listerKubeConfig:
+skipperBackendsAnnotation:
+skipperIngressMetrics:
+token:
+vmodule:
+
+authentication:
+  kubeConfig:
+  skipLookup:
+  tokenWebhookCacheTtl:
+  tolerateLookupFailure:
+
+authorization:
+  kubeConfig:
+  alwaysAllowPaths:
+  webhookCache:
+    authorizedTtl:
+    unauthorizedTtl:
+
+aws:
+  externalMetrics:
+  region:
+
+influxDB:
+  address:
+  organization:
+  token:
+
+log:
+  alsoToStderr:
+  toStderr:
+  flushFrequency:
+  backtraceAtTraceLocation:
+  directory:
+  file:
+  fileMaxSize:
+  level:
+  stderrThreshold:
+  skipHeaders:
+  skipLogHeaders:
+
+prometheus:
+  server: http://prometheus.kube-system.svc.cluster.local
+  metricsAddress:
+
+requestHeader:
+  allowedNames:
+  clientCaFile:
+  extraHeadersPrefix:
+  groupHeaders:
+  usernameHeaders:
+
+tls:
+  skipTLSVerify: true
+  certificateDirectory:
+  clientCaFile:
+  certFile:
+  cipherSuites:
+  minVersion:
+  privateKeyFile:
+  sniCertKey:
+
+zmon:
+  kariosdbEndpoint:
+  tokenName:
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 100Mi
+  requests:
+    cpu: 100m
+    memory: 100Mi
+
+scalingSchedule:
+  enabled: false
+
+nodeSelector:
+  kubernetes.io/os: linux
+
+tolerations: []
+
+affinity: {}
+
+priorityClassName: ""
+
+podAnnotations: {}

docs/rbac.yaml

@@ -64,12 +64,22 @@ rules:
   - statefulsets
   verbs:
   - get
+# only relevant if running with the flag:
+# --skipper-ingress-metrics
 - apiGroups:
-  - extensions
+  - networking.k8s.io
   resources:
   - ingresses
   verbs:
   - get
+# only relevant if running with the flag:
+# --skipper-routegroup-metrics
+- apiGroups:
+  - zalando.org
+  resources:
+  - routegroups
+  verbs:
+  - get
 - apiGroups:
   - autoscaling
   resources:
@@ -78,6 +88,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - zalando.org
+  resources:
+  - clusterscalingschedules
+  - scalingschedules
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

docs/scaling_schedules_crd.yaml

@@ -0,0 +1,124 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.8.0
+  creationTimestamp: null
+  name: scalingschedules.zalando.org
+spec:
+  group: zalando.org
+  names:
+    kind: ScalingSchedule
+    listKind: ScalingScheduleList
+    plural: scalingschedules
+    singular: scalingschedule
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ScalingSchedule describes a namespaced time based metric to be
+          used in autoscaling operations.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScalingScheduleSpec is the spec part of the ScalingSchedule.
+            properties:
+              scalingWindowDurationMinutes:
+                description: Fade the scheduled values in and out over this many minutes.
+                  If unset, the default per-cluster value will be used.
+                format: int64
+                type: integer
+              schedules:
+                description: Schedules is the list of schedules for this ScalingSchedule
+                  resource. All the schedules defined here will result on the value
+                  to the same metric. New metrics require a new ScalingSchedule resource.
+                items:
+                  description: Schedule is the schedule details to be used inside
+                    a ScalingSchedule.
+                  properties:
+                    date:
+                      description: Defines the starting date of a OneTime schedule.
+                        It has to be a RFC3339 formated date.
+                      format: date-time
+                      type: string
+                    durationMinutes:
+                      description: The duration in minutes that the configured value
+                        will be returned for the defined schedule.
+                      type: integer
+                    period:
+                      description: Defines the details of a Repeating schedule.
+                      properties:
+                        days:
+                          description: The days that this schedule will be active.
+                          items:
+                            description: ScheduleDay represents the valid inputs for
+                              days in a SchedulePeriod.
+                            enum:
+                            - Sun
+                            - Mon
+                            - Tue
+                            - Wed
+                            - Thu
+                            - Fri
+                            - Sat
+                            type: string
+                          type: array
+                        startTime:
+                          description: The startTime has the format HH:MM
+                          pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
+                          type: string
+                        timezone:
+                          description: The location name corresponding to a file in
+                            the IANA Time Zone database, like Europe/Berlin.
+                          type: string
+                      required:
+                      - days
+                      - startTime
+                      - timezone
+                      type: object
+                    type:
+                      description: Defines if the schedule is a OneTime schedule or
+                        Repeating one. If OneTime, date has to be defined. If Repeating,
+                        Period has to be defined.
+                      enum:
+                      - OneTime
+                      - Repeating
+                      type: string
+                    value:
+                      description: The metric value that will be returned for the
+                        defined schedule.
+                      format: int64
+                      type: integer
+                  required:
+                  - durationMinutes
+                  - type
+                  - value
+                  type: object
+                type: array
+            required:
+            - schedules
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

example/Dockerfile

@@ -1,5 +1,5 @@
-FROM registry.opensource.zalan.do/stups/alpine:latest
-MAINTAINER Team Teapot @ Zalando SE <team-teapot@zalando.de>
+FROM registry.opensource.zalan.do/library/alpine-3.13:latest
+LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
 
 # add binary
 ADD build/linux/custom-metrics-consumer /

example/deploy/hpa.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     application: custom-metrics-consumer
   annotations:
-    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
+    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
     metric-config.pods.queue-length.json-path/json-key: "$.queue.length"
     metric-config.pods.queue-length.json-path/path: /metrics
     metric-config.pods.queue-length.json-path/port: "9090"
@@ -39,7 +39,7 @@ spec:
   - type: Object
     object:
       describedObject:
-        apiVersion: extensions/v1beta1
+        apiVersion: networking.k8s.io/v1
         kind: Ingress
         name: custom-metrics-consumer
       metric:
@@ -50,9 +50,10 @@ spec:
   - type: External
     external:
       metric:
-        name: sqs-queue-length
+        name: app-queue-length
         selector:
           matchLabels:
+            type: sqs-queue-length
             queue-name: foobar
             region: eu-central-1
       target:

example/deploy/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: custom-metrics-consumer

example/main.go

@@ -11,7 +11,9 @@ import (
 func metricsHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
 	_, err := w.Write([]byte(fmt.Sprintf(`{"queue": {"length": %d}}`, size)))
-	log.Fatalf("failed to write: %v", err)
+	if err != nil {
+		log.Fatalf("failed to write: %v", err)
+	}
 }
 
 var (

go.mod

@@ -1,34 +1,121 @@
 module github.com/zalando-incubator/kube-metrics-adapter
 
 require (
-	github.com/NYTimes/gziphandler v1.0.1 // indirect
-	github.com/aws/aws-sdk-go v1.35.0
-	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/influxdata/influxdb-client-go v0.1.5
-	github.com/kubernetes-incubator/custom-metrics-apiserver v0.0.0-20200618121405-54026617ec44
-	github.com/lib/pq v1.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/prometheus/client_golang v1.7.1
-	github.com/prometheus/common v0.14.0
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/cobra v0.0.7
-	github.com/spyzhov/ajson v0.4.2
-	github.com/stretchr/testify v1.6.1
-	github.com/zalando-incubator/cluster-lifecycle-manager v0.0.0-20180921141935-824b77fb1f84
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/tools v0.0.0-20200204192400-7124308813f3 // indirect
-	gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
-	honnef.co/go/tools v0.0.1-2020.1.3 // indirect
-	k8s.io/api v0.18.8
-	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.8
-	k8s.io/component-base v0.18.8
+	github.com/aws/aws-sdk-go v1.44.94
+	github.com/influxdata/influxdb-client-go v0.2.0
+	github.com/prometheus/client_golang v1.13.0
+	github.com/prometheus/common v0.37.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.5.0
+	github.com/spyzhov/ajson v0.7.1
+	github.com/stretchr/testify v1.8.0
+	github.com/szuecs/routegroup-client v0.21.1
+	github.com/zalando-incubator/cluster-lifecycle-manager v0.0.0-20220201095549-bbdeecaa4fc1
+	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
+	k8s.io/api v0.23.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/apiserver v0.23.0
+	k8s.io/client-go v0.23.0
+	k8s.io/code-generator v0.23.0
+	k8s.io/component-base v0.23.0
 	k8s.io/klog v1.0.0
-	k8s.io/metrics v0.18.8
+	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
+	k8s.io/metrics v0.22.12
+	sigs.k8s.io/controller-tools v0.8.0
+	sigs.k8s.io/custom-metrics-apiserver v1.22.0
 )
 
-// use version that provides: https://github.com/kubernetes-sigs/custom-metrics-apiserver/pull/65
-replace github.com/kubernetes-incubator/custom-metrics-apiserver => github.com/mikkeloscar/custom-metrics-apiserver v0.0.0-20200626202535-cd2d550cf55d
+require (
+	github.com/NYTimes/gziphandler v1.1.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful v2.15.0+incompatible // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/felixge/httpsnoop v1.0.2 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.20.0 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/gobuffalo/flect v0.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/spf13/afero v1.8.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
+	go.etcd.io/etcd/client/v2 v2.305.1 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.0 // indirect
+	go.opentelemetry.io/contrib v0.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
+	go.opentelemetry.io/otel v0.20.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
+	go.opentelemetry.io/otel/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/trace v0.20.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.19.0 // indirect
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
+	google.golang.org/grpc v1.47.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.23.0 // indirect
+	k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
+	k8s.io/klog/v2 v2.80.0 // indirect
+	k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
 
-go 1.13
+go 1.19