Handle 0 values in max collector and unknown metric type

Signed-off-by: Arjun Naik <arjun.rn@gmail.com>

.github/CODEOWNERS

@@ -0,0 +1,35 @@
+# These owners will be the default owners for everything in
+# the repo. 
+*       @arjunrn
+
+
+
+# Samples for assigning codeowners below:
+# Order is important; the last matching pattern takes the most
+# precedence. When someone opens a pull request that only
+# modifies JS files, only @js-owner and not the global
+# owner(s) will be requested for a review.
+# *.js    @js-owner
+
+# You can also use email addresses if you prefer. They'll be
+# used to look up users just like we do for commit author
+# emails.
+# *.go docs@example.com
+
+# In this example, @doctocat owns any files in the build/logs
+# directory at the root of the repository and any of its
+# subdirectories.
+# /build/logs/ @doctocat
+
+# The `docs/*` pattern will match files like
+# `docs/getting-started.md` but not further nested files like
+# `docs/build-app/troubleshooting.md`.
+# docs/*  docs@example.com
+
+# In this example, @octocat owns any file in an apps directory
+# anywhere in your repository.
+# apps/ @octocat
+
+# In this example, @doctocat owns any file in the `/docs`
+# directory in the root of your repository.
+# /docs/ @doctocat

.github/dependabot.yml

@@ -1,14 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "07:00"
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "07:00"
-  open-pull-requests-limit: 10

.github/workflows/ci.yaml

@@ -1,25 +0,0 @@
-name: ci
-on: [push, pull_request]
-env:
-  GO111MODULE: on
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
-      with:
-        go-version: '^1.16'
-    - run: go version
-    - run: go get github.com/mattn/goveralls
-      env:
-        GO111MODULE: off
-    - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_RELEASE}
-      env:
-        GOLANGCI_RELEASE: v1.37.0
-    - run: make build.docker
-    - run: make test
-    - run: make check
-    - run: goveralls -coverprofile=profile.cov -service=github
-      env:
-        COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

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

.golangci.yml

@@ -1,19 +0,0 @@
-run:
-linters-settings:
-  golint:
-      min-confidence: 0.9
-
-linters:
-  disable-all: true
-  enable:
-    - staticcheck
-    - ineffassign
-    - golint
-    - goimports
-    - errcheck
-issues:
-  exclude-rules:
-    # Exclude some staticcheck messages
-    - linters:
-        - staticcheck
-      text: "SA9003:"

.travis.yml

@@ -0,0 +1,18 @@
+language: go
+dist: xenial
+
+go:
+  - "1.11.x"
+
+env:
+- GO111MODULE=on
+
+before_install:
+  - go get github.com/mattn/goveralls
+  - go get github.com/lawrencewoodman/roveralls
+
+script:
+  - make test
+  - make build.docker
+  - roveralls
+  - goveralls -v -coverprofile=roveralls.coverprofile -service=travis-ci

Dockerfile

@@ -1,7 +1,5 @@
-FROM registry.opensource.zalan.do/library/alpine-3.12:latest
-LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
-
-RUN apk add --no-cache tzdata
+FROM registry.opensource.zalan.do/stups/alpine:latest
+MAINTAINER Team Teapot @ Zalando SE <team-teapot@zalando.de>
 
 # add binary
 ADD build/linux/kube-metrics-adapter /

MAINTAINERS

@@ -1,2 +1,3 @@
 Mikkel Larsen <mikkel.larsen@zalando.de>
+Arjun Naik <arjun.naik@zalando.de>
 Team Teapot <team-teapot@zalando.de>

Makefile

@@ -8,57 +8,31 @@ 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: $(GENERATED)
-	go test -v -coverprofile=profile.cov $(GOPKGS)
+test:
+	go test -v $(GOPKGS)
 
-check: $(GENERATED)
-	go mod download
-	golangci-lint run --timeout=2m ./...
+check:
+	golint $(GOPKGS)
+	go vet -v $(GOPKGS)
 
-
-$(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.local: build/$(BINARY)
 build.linux: build/linux/$(BINARY)
 build.osx: build/osx/$(BINARY)
 
-build/$(BINARY): go.mod $(SOURCES) $(GENERATED)
+build/$(BINARY): go.mod $(SOURCES)
 	CGO_ENABLED=0 go build -o build/$(BINARY) $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" .
 
-build/linux/$(BINARY): go.mod $(SOURCES) $(GENERATED)
+build/linux/$(BINARY): go.mod $(SOURCES)
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/linux/$(BINARY) -ldflags "$(LDFLAGS)" .
 
-build/osx/$(BINARY): go.mod $(SOURCES) $(GENERATED)
+build/osx/$(BINARY): go.mod $(SOURCES)
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/osx/$(BINARY) -ldflags "$(LDFLAGS)" .
 
 build.docker: build.linux

SECURITY.md

@@ -1,8 +1,7 @@
 We acknowledge that every line of code that we write may potentially contain security issues.
-We are trying to deal with it responsibly and provide patches as quickly as possible.
 
-We host our bug bounty program on HackerOne, it is currently private, therefore if you would like to report a vulnerability and get rewarded for it, please ask to join our program by filling this form:
+We are trying to deal with it responsibly and provide patches as quickly as  possible. If you have anything to report to us please use the following channels:
 
-https://corporate.zalando.com/en/services-and-contact#security-form
-
-You can also send you report via this form if you do not want to join our bug bounty program and just want to report a vulnerability or security issue.
+Email: Tech-Security@zalando.de
+OR
+Submit your vulnerability report through our bug bounty program at: https://hackerone.com/zalando

delivery.yaml

@@ -2,13 +2,7 @@ version: "2017-09-20"
 pipeline:
 - id: build
   overlay: ci/golang
-  cache:
-    paths:
-    - /go/pkg/mod       # pkg cache for Go modules
-    - ~/.cache/go-build # Go build cache
   type: script
-  env:
-    GOFLAGS: "-mod=readonly"
   commands:
   - desc: test
     cmd: |
@@ -20,11 +14,7 @@ pipeline:
     cmd: |
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-metrics-adapter
-        VERSION=$(git describe --tags --always)
       else
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-metrics-adapter-test
-        VERSION=$CDP_BUILD_VERSION
       fi
-      IMAGE=$IMAGE VERSION=$VERSION make build.docker
-      git diff --stat --exit-code
-      IMAGE=$IMAGE VERSION=$VERSION make build.push
+      IMAGE=$IMAGE VERSION=$CDP_BUILD_VERSION make build.push

docs/cluster_scaling_schedules_crd.yaml

@@ -1,125 +0,0 @@
-
----
-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:
-              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/v1
+apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
   name: v1beta1.custom.metrics.k8s.io

docs/deployment.yaml

@@ -28,7 +28,6 @@ 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/v1
+apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
   name: v1beta1.external.metrics.k8s.io

docs/helm/Chart.yaml

@@ -1,9 +0,0 @@
-apiVersion: v2
-name: kube-metrics-adapter
-version: 0.1.11
-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

@@ -1,119 +0,0 @@
-{{- 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

@@ -1,15 +0,0 @@
-{{- 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

@@ -1,194 +0,0 @@
-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 }}
-    spec:
-      serviceAccountName: kube-metrics-adapter
-      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

@@ -1,15 +0,0 @@
-{{- 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

@@ -1,165 +0,0 @@
-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:
-  - extensions
-  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

@@ -1,119 +0,0 @@
-{{- 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

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

docs/helm/templates/service.yaml

@@ -1,11 +0,0 @@
-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

@@ -1,97 +0,0 @@
-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

docs/rbac.yaml

@@ -64,23 +64,12 @@ 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:
@@ -89,15 +78,6 @@ 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

@@ -1,125 +0,0 @@
-
----
-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:
-              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/deploy/hpa.yaml

@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: custom-metrics-consumer
@@ -6,7 +6,7 @@ metadata:
   labels:
     application: custom-metrics-consumer
   annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
+    # metric-config.<metricType>.<metricName>.<collectorName>/<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"
@@ -25,37 +25,24 @@ spec:
   # - type: Resource
   #   resource:
   #     name: cpu
-  #     current:
-  #       averageUtilization: 50
-
+  #     targetAverageUtilization: 50
   - type: Pods
     pods:
-      metric:
-        name: queue-length
-      target:
-        averageValue: 1k
-        type: AverageValue
-
+      metricName: queue-length
+      targetAverageValue: 1k
   - type: Object
     object:
-      describedObject:
+      metricName: requests-per-second
+      target:
         apiVersion: extensions/v1beta1
         kind: Ingress
         name: custom-metrics-consumer
-      metric:
-        name: requests-per-second
-      target:
-        averageValue: "10"
-        type: AverageValue
+      targetValue: 10 # this will be treated as targetAverageValue
   - type: External
     external:
-      metric:
-        name: app-queue-length
-        selector:
-          matchLabels:
-            type: sqs-queue-length
-            queue-name: foobar
-            region: eu-central-1
-      target:
-        averageValue: "30"
-        type: AverageValue
+      metricName: sqs-queue-length
+      metricSelector:
+        matchLabels:
+          queue-name: foobar
+          region: eu-central-1
+      targetAverageValue: 30

example/main.go

@@ -3,15 +3,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"net/http"
 	"time"
 )
 
 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)
+	w.Write([]byte(fmt.Sprintf(`{"queue": {"length": %d}}`, size)))
 }
 
 var (
@@ -31,5 +29,5 @@ func main() {
 		ReadTimeout: 5 * time.Second,
 	}
 
-	log.Fatal(server.ListenAndServe())
+	server.ListenAndServe()
 }