Basic CRD for scheduled scaling

Signed-off-by: Arjun Naik <arjun.rn@gmail.com>
2026-03-10 10:10:32 +00:00 · 2020-03-27 10:47:26 +01:00
79 changed files with 2490 additions and 18129 deletions
@@ -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
@@ -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
@@ -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 }}
@@ -1,5 +1,4 @@
 build/
 apiserver.local.config/
 .idea/
-profile.cov
 vendor/
@@ -0,0 +1,20 @@
+language: go
+dist: xenial
+
+go:
+  - "1.13.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
@@ -1,5 +1,5 @@
-FROM registry.opensource.zalan.do/library/alpine-3.12:latest
-LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
+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 /
@@ -1,2 +1,3 @@
 Mikkel Larsen <mikkel.larsen@zalando.de>
+Arjun Naik <arjun.naik@zalando.de>
 Team Teapot <team-teapot@zalando.de>
@@ -8,45 +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

-
 default: build.local

 clean:
 	rm -rf build
-	rm -rf $(OPENAPI)

 test:
-	go test -v -coverprofile=profile.cov $(GOPKGS)
+	go test -v $(GOPKGS)

 check:
 	go mod download
 	golangci-lint run --timeout=2m ./...

-
-$(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)
 build.linux: build/linux/$(BINARY)
 build.osx: build/osx/$(BINARY)

-build/$(BINARY): go.mod $(SOURCES) $(OPENAPI)
+build/$(BINARY): go.mod $(SOURCES)
 	CGO_ENABLED=0 go build -o build/$(BINARY) $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" .

-build/linux/$(BINARY): go.mod $(SOURCES) $(OPENAPI)
+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) $(OPENAPI)
+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
@@ -10,7 +10,7 @@ It supports scaling based on [Prometheus metrics](https://prometheus.io/), [SQS

 It discovers Horizontal Pod Autoscaling resources and starts to collect the
 requested metrics and stores them in memory. It's implemented using the
-[custom-metrics-apiserver](https://github.com/kubernetes-sigs/custom-metrics-apiserver)
+[custom-metrics-apiserver](https://github.com/kubernetes-incubator/custom-metrics-apiserver)
 library.

 Here's an example of a `HorizontalPodAutoscaler` resource configured to get
@@ -22,7 +22,7 @@ kind: HorizontalPodAutoscaler
 metadata:
  name: myapp-hpa
  annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
    metric-config.pods.requests-per-second.json-path/json-key: "$.http_server.rps"
    metric-config.pods.requests-per-second.json-path/path: /metrics
    metric-config.pods.requests-per-second.json-path/port: "9090"
@@ -104,7 +104,7 @@ kind: HorizontalPodAutoscaler
 metadata:
  name: myapp-hpa
  annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
    metric-config.pods.requests-per-second.json-path/json-key: "$.http_server.rps"
    metric-config.pods.requests-per-second.json-path/path: /metrics
    metric-config.pods.requests-per-second.json-path/port: "9090"
@@ -142,7 +142,7 @@ example the following JSON data would be expected:
 ```

 The json-path query support depends on the
-[github.com/spyzhov/ajson](https://github.com/spyzhov/ajson) library.
+[github.com/oliveagle/jsonpath](https://github.com/oliveagle/jsonpath) library.
 See the README for possible queries. It's expected that the metric you query
 returns something that can be turned into a `float64`.

@@ -166,14 +166,6 @@ will create a URL like this:
 http://<podIP>:9090/metrics?foo=bar&baz=bop
 ```

-There are also configuration options for custom (connect and request) timeouts when querying pods for metrics:
-```yaml
-metric-config.pods.requests-per-second.json-path/request-timeout: 2s
-metric-config.pods.requests-per-second.json-path/connect-timeout: 500ms
-```
-
-The default for both of the above values is 15 seconds.
-
 ## Prometheus collector

 The Prometheus collector is a generic collector which can map Prometheus
@@ -202,24 +194,15 @@ the trade-offs between the two approaches.
 | `prometheus-query` | Generic metric which requires a user defined query. | External | | `>=1.12` |
 | *custom* | No predefined metrics. Metrics are generated from user defined queries. | Object | *any* | `>=1.12` |

-### Configure Scrape Interval
-
-There is a way to set the interval via an annotation like:
-
-```yaml
-metric-config.external.prometheus-query.prometheus/interval: 30s
-```
-
-Default is 1 minute.
-
 ### Example: External Metric

 This is an example of an HPA configured to get metrics based on a Prometheus
 query. The query is defined in the annotation
-`metric-config.external.processed-events-per-second.prometheus/query`
+`metric-config.external.prometheus-query.prometheus/processed-events-per-second`
 where `processed-events-per-second` is the query name which will be associated
-with the result of the query.
-This allows having multiple prometheus queries associated with a single HPA.
+with the result of the query. A matching `query-name` label must be defined in
+the `matchLabels` of the metric definition. This allows having multiple
+prometheus queries associated with a single HPA.

 ```yaml
 apiVersion: autoscaling/v2beta2
@@ -230,9 +213,10 @@ metadata:
    # This annotation is optional.
    # If specified, then this prometheus server is used,
    # instead of the prometheus server specified as the CLI argument `--prometheus-server`.
-    metric-config.external.processed-events-per-second.prometheus/prometheus-server: http://prometheus.my-namespace.svc
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
-    metric-config.external.processed-events-per-second.prometheus/query: |
+    metric-config.external.prometheus-query.prometheus/prometheus-server: http://prometheus.my-namespace.svc
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
+    # <configKey> == query-name
+    metric-config.external.prometheus-query.prometheus/processed-events-per-second: |
      scalar(sum(rate(event-service_events_count{application="event-service",processed="true"}[1m])))
 spec:
  scaleTargetRef:
@@ -245,10 +229,10 @@ spec:
  - type: External
    external:
      metric:
-        name: processed-events-per-second
+        name: prometheus-query
        selector:
          matchLabels:
-            type: prometheus
+            query-name: processed-events-per-second
      target:
        type: AverageValue
        averageValue: "10"
@@ -279,7 +263,7 @@ kind: HorizontalPodAutoscaler
 metadata:
  name: myapp-hpa
  annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
    metric-config.object.processed-events-per-second.prometheus/query: |
      scalar(sum(rate(event-service_events_count{application="event-service",processed="true"}[1m])))
    metric-config.object.processed-events-per-second.prometheus/per-replica: "true"
@@ -380,9 +364,10 @@ we only support Flux instead of InfluxQL.

 This is an example of an HPA configured to get metrics based on a Flux query.
 The query is defined in the annotation
-`metric-config.external.<metricName>.influxdb/query` where `<metricName>` is
-the query name which will be associated with the result of the query.  This
-allows having multiple flux queries associated with a single HPA.
+`metric-config.external.flux-query.influxdb/queue_depth`
+where `queue_depth` is the query name which will be associated with the result of the query.
+A matching `query-name` label must be defined in the `matchLabels` of the metric definition.
+This allows having multiple flux queries associated with a single HPA.

 ```yaml
 apiVersion: autoscaling/v2beta2
@@ -396,13 +381,13 @@ metadata:
    #  - --influxdb-address
    #  - --influxdb-token
    #  - --influxdb-org
-    metric-config.external.queue-depth.influxdb/address: "http://influxdbv2.my-namespace.svc"
-    metric-config.external.queue-depth.influxdb/token: "secret-token"
+    metric-config.external.flux-query.influxdb/address: "http://influxdbv2.my-namespace.svc"
+    metric-config.external.flux-query.influxdb/token: "secret-token"
    # This could be either the organization name or the ID.
-    metric-config.external.queue-depth.influxdb/org: "deadbeef"
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
+    metric-config.external.flux-query.influxdb/org: "deadbeef"
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
    # <configKey> == query-name
-    metric-config.external.queue-depth.influxdb/query: |
+    metric-config.external.flux-query.influxdb/queue_depth: |
        from(bucket: "apps")
          |> range(start: -30s)
          |> filter(fn: (r) => r._measurement == "queue_depth")
@@ -422,10 +407,10 @@ spec:
  - type: External
    external:
      metric:
-        name: queue-depth
+        name: flux-query
        selector:
          matchLabels:
-            type: influxdb
+            query-name: queue_depth
      target:
        type: Value
        value: "1"
@@ -487,10 +472,9 @@ spec:
  - type: External
    external:
      metric:
-        name: my-sqs
+        name: sqs-queue-length
        selector:
          matchLabels:
-            type: sqs-queue-length
            queue-name: foobar
            region: eu-central-1
      target:
@@ -529,9 +513,9 @@ kind: HorizontalPodAutoscaler
 metadata:
  name: myapp-hpa
  annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
-    metric-config.external.my-zmon-check.zmon/key: "custom.*"
-    metric-config.external.my-zmon-check.zmon/tag-application: "my-custom-app-*"
+    # metric-config.<metricType>.<metricName>.<collectorName>/<configKey>
+    metric-config.external.zmon-check.zmon/key: "custom.*"
+    metric-config.external.zmon-check.zmon/tag-application: "my-custom-app-*"
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
@@ -543,18 +527,17 @@ spec:
  - type: External
    external:
      metric:
-          name: my-zmon-check
+          name: zmon-check
          selector:
            matchLabels:
-              type: zmon
              check-id: "1234" # the ZMON check to query for metrics
              key: "custom.value"
              tag-application: my-custom-app
              aggregators: avg # comma separated list of aggregation functions, default: last
              duration: 5m # default: 10m
-      target:
-        averageValue: "30"
-        type: AverageValue
+        target:
+          averageValue: "30"
+          type: AverageValue
 ```

 The `check-id` specifies the ZMON check to query for the metrics. `key`
@@ -596,65 +579,9 @@ specify a duration of `5m` then the query will return metric points for the
 last 5 minutes and apply the specified aggregation with the same duration .e.g
 `max(5m)`.

-The annotations `metric-config.external.my-zmon-check.zmon/key` and
-`metric-config.external.my-zmon-check.zmon/tag-<name>` can be optionally used if
+The annotations `metric-config.external.zmon-check.zmon/key` and
+`metric-config.external.zmon-check.zmon/tag-<name>` can be optionally used if
 you need to define a `key` or other `tag` with a "star" query syntax like
 `values.*`. This *hack* is in place because it's not allowed to use `*` in the
 metric label definitions. If both annotations and corresponding label is
 defined, then the annotation takes precedence.
-
-## HTTP Collector
-
-The http collector allows collecting metrics from an external endpoint specified in the HPA.
-Currently only `json-path` collection is supported.
-
-### Supported metrics
-
-| Metric | Description | Type | K8s Versions |
-| ------------ | -------------- | ------- | -- |
-| *custom* | No predefined metrics. Metrics are generated from user defined queries. | Pods | `>=1.12` |
-
-### Example
-
-This is an example of using the HTTP collector to collect metrics from a json
-metrics endpoint specified in the annotations.
-
-```yaml
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: myapp-hpa
-  annotations:
-    # metric-config.<metricType>.<metricName>.<collectorType>/<configKey>
-    metric-config.external.unique-metric-name.json-path/json-key: "$.some-metric.value"
-    metric-config.external.unique-metric-name.json-path/endpoint: "http://metric-source.app-namespace:8080/metrics"
-    metric-config.external.unique-metric-name.json-path/aggregator: "max"
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: myapp
-  minReplicas: 1
-  maxReplicas: 10
-  metrics:
-  - type: External
-    external:
-      metric:
-        name: unique-metric-name
-        selector:
-          matchLabels:
-            type: json-path
-      target:
-        averageValue: 1
-        type: AverageValue
-```
-
-The HTTP collector similar to the Pod Metrics collector. The metric name should always be `http`.
-This value is also used in the annotations to configure the metrics adapter to query the required
-target. The following configuration values are supported:
-
- `json-key` to specify the JSON path of the metric to be queried
- `endpoint` the fully formed path to query for the metric. In the above example a Kubernetes _Service_
-    in the namespace `app-namespace` is called.
- `aggregator` is only required if the metric is an array of values and specifies how the values
-    are aggregated. Currently this option can support the values: `sum`, `max`, `min`, `avg`.
@@ -1,9 +0,0 @@
-apiVersion: v2
-name: kube-metrics-adapter
-version: 0.1.9
-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
@@ -1,15 +0,0 @@
-{{- if .Values.enableCustomMetricsApi }}
-apiVersion: apiregistration.k8s.io/v1beta1
-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}}
@@ -1,191 +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}}
-          resources:
-            limits:
-              cpu: {{ .Values.resources.limits.cpu }}
-              memory: {{ .Values.resources.limits.memory }}
-            requests:
-              cpu: {{ .Values.resources.requests.cpu }}
-              memory: {{ .Values.resources.requests.memory }}
@@ -1,15 +0,0 @@
-{{- if .Values.enableExternalMetricsApi }}
-apiVersion: apiregistration.k8s.io/v1beta1
-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}}
@@ -1,154 +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
---
-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 }}
@@ -1,5 +0,0 @@
-kind: ServiceAccount
-apiVersion: v1
-metadata:
-  name: kube-metrics-adapter
-  namespace: {{ .Values.namespace }}
@@ -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
@@ -1,94 +0,0 @@
-namespace: kube-system
-
-replicas: 1
-
-registry:
-  image: registry.opensource.zalan.do/teapot/kube-metrics-adapter
-  imageTag: v0.1.9
-  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
@@ -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"
@@ -50,10 +50,9 @@ spec:
  - type: External
    external:
      metric:
-        name: app-queue-length
+        name: sqs-queue-length
        selector:
          matchLabels:
-            type: sqs-queue-length
            queue-name: foobar
            region: eu-central-1
      target:
@@ -2,32 +2,32 @@ module github.com/zalando-incubator/kube-metrics-adapter

 require (
 	github.com/NYTimes/gziphandler v1.0.1 // indirect
-	github.com/aws/aws-sdk-go v1.37.1
-	github.com/go-openapi/spec v0.20.2
-	github.com/influxdata/influxdb-client-go v0.2.0
-	github.com/influxdata/line-protocol v0.0.0-20201012155213-5f565037cbc9 // indirect
-	github.com/kubernetes-sigs/custom-metrics-apiserver v0.0.0-20201216091021-1b9fa998bbaa
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/prometheus/client_golang v1.9.0
-	github.com/prometheus/common v0.15.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.7.0
+	github.com/aws/aws-sdk-go v1.29.4
+	github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3 // indirect
+	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
+	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.4.1 // indirect
+	github.com/influxdata/influxdb-client-go v0.1.4
+	github.com/kubernetes-incubator/custom-metrics-apiserver v0.0.0-20190918110929-3d9be26a50eb
+	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
+	github.com/prometheus/client_golang v0.9.2
+	github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
+	github.com/sirupsen/logrus v1.4.2
+	github.com/soheilhy/cmux v0.1.4 // indirect
+	github.com/spf13/cobra v0.0.3
+	github.com/stretchr/testify v1.4.0
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
 	github.com/zalando-incubator/cluster-lifecycle-manager v0.0.0-20180921141935-824b77fb1f84
-	golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 // indirect
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.20.0
-	k8s.io/apimachinery v0.20.0
-	k8s.io/apiserver v0.20.0
-	k8s.io/client-go v0.20.0
-	k8s.io/component-base v0.20.0
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
+	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+	k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad // indirect
+	k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
+	k8s.io/code-generator v0.17.4
+	k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
 	k8s.io/klog v1.0.0
-	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
-	k8s.io/metrics v0.20.0
+	k8s.io/metrics v0.0.0-20190226180357-f3f09b9076d1
 )

-go 1.15
+go 1.13
@@ -1,5 +1,5 @@
 /*
-Copyright The Kubernetes Authors.
+Copyright YEAR The Kubernetes Authors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,4 +13,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
@@ -1,6 +1,5 @@
-// +build tools
+package main

-// This package imports things required by build scripts, to force `go mod` to see them as dependencies
-package tools
-
-import _ "k8s.io/kube-openapi/cmd/openapi-gen"
+import (
+	_ "k8s.io/code-generator"
+)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -x
+SRC="github.com"
+GOPKG="$SRC/zalando-incubator/kube-metrics-adapter"
+CUSTOM_RESOURCE_NAME="zalando.org"
+CUSTOM_RESOURCE_VERSION="v1"
+
+SCRIPT_ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+OUTPUT_BASE="$(dirname ${BASH_SOURCE})/"
+
+go mod vendor
+
+# generate the code with:
+# --output-base    because this script should also be able to run inside the vendor dir of
+#                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
+#                  instead of the $GOPATH directly. For normal projects this can be dropped.
+bash "${CODEGEN_PKG}"/generate-groups.sh all \
+  "${GOPKG}/pkg/client" "${GOPKG}/pkg/apis" \
+  "${CUSTOM_RESOURCE_NAME}:${CUSTOM_RESOURCE_VERSION}" \
+  --go-header-file hack/boilerplate.go.txt \
+  --output-base "$OUTPUT_BASE"
+
+# To use your own boilerplate text append:
+#   --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt
+
+# hack to make the generated code work with Go module based projects
+cp -r "$OUTPUT_BASE/$GOPKG/pkg/apis" ./pkg
+cp -r "$OUTPUT_BASE/$GOPKG/pkg/client" ./pkg
+rm -rf "${OUTPUT_BASE:?}${SRC}"
@@ -15,7 +15,7 @@ const (
 )

 type AnnotationConfigs struct {
-	CollectorType string
+	CollectorName string
 	Configs       map[string]string
 	PerReplica    bool
 	Interval      time.Duration
@@ -64,14 +64,14 @@ func (m AnnotationConfigMap) Parse(annotations map[string]string) error {
 		config, ok := m[key]
 		if !ok {
 			config = &AnnotationConfigs{
-				CollectorType: metricCollector,
+				CollectorName: metricCollector,
 				Configs:       map[string]string{},
 			}
 			m[key] = config
 		}

 		// TODO: fail if collector name doesn't match
-		if config.CollectorType != metricCollector {
+		if config.CollectorName != metricCollector {
 			continue
 		}

@@ -86,21 +86,6 @@ func TestParser(t *testing.T) {
 				"org-id":  "deadbeef",
 			},
 		},
-		{
-			Name: "http metrics",
-			Annotations: map[string]string{
-				"metric-config.external.http.json/json-key":   "$.metric.value",
-				"metric-config.external.http.json/endpoint":   "http://metric-source.source-namespace.svc.cluster.local:8000/metrics",
-				"metric-config.external.http.json/aggregator": "avg",
-			},
-			MetricName: "http",
-			MetricType: autoscalingv2.ExternalMetricSourceType,
-			ExpectedConfig: map[string]string{
-				"json-key":   "$.metric.value",
-				"endpoint":   "http://metric-source.source-namespace.svc.cluster.local:8000/metrics",
-				"aggregator": "avg",
-			},
-		},
 	} {
 		t.Run(tc.Name, func(t *testing.T) {
 			hpaMap := make(AnnotationConfigMap)
@@ -0,0 +1,6 @@
+package zalando
+
+const (
+	// GroupName is the group name used in this package.
+	GroupName = "zalando.org"
+)
@@ -0,0 +1,17 @@
+package v1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+
+// ScheduledScaling describes an application resource.
+// +k8s:deepcopy-gen=true
+type ScheduledScaling struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+}
+
@@ -0,0 +1,51 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ScheduledScaling) DeepCopyInto(out *ScheduledScaling) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScheduledScaling.
+func (in *ScheduledScaling) DeepCopy() *ScheduledScaling {
+	if in == nil {
+		return nil
+	}
+	out := new(ScheduledScaling)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ScheduledScaling) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
@@ -0,0 +1,97 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package versioned
+
+import (
+	"fmt"
+
+	zalandov1 "github.com/zalando-incubator/kube-metrics-adapter/pkg/client/clientset/versioned/typed/zalando.org/v1"
+	discovery "k8s.io/client-go/discovery"
+	rest "k8s.io/client-go/rest"
+	flowcontrol "k8s.io/client-go/util/flowcontrol"
+)
+
+type Interface interface {
+	Discovery() discovery.DiscoveryInterface
+	ZalandoV1() zalandov1.ZalandoV1Interface
+}
+
+// Clientset contains the clients for groups. Each group has exactly one
+// version included in a Clientset.
+type Clientset struct {
+	*discovery.DiscoveryClient
+	zalandoV1 *zalandov1.ZalandoV1Client
+}
+
+// ZalandoV1 retrieves the ZalandoV1Client
+func (c *Clientset) ZalandoV1() zalandov1.ZalandoV1Interface {
+	return c.zalandoV1
+}
+
+// Discovery retrieves the DiscoveryClient
+func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+	if c == nil {
+		return nil
+	}
+	return c.DiscoveryClient
+}
+
+// NewForConfig creates a new Clientset for the given config.
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
+// NewForConfig will generate a rate-limiter in configShallowCopy.
+func NewForConfig(c *rest.Config) (*Clientset, error) {
+	configShallowCopy := *c
+	if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
+		if configShallowCopy.Burst <= 0 {
+			return nil, fmt.Errorf("Burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0")
+		}
+		configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
+	}
+	var cs Clientset
+	var err error
+	cs.zalandoV1, err = zalandov1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+
+	cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+	return &cs, nil
+}
+
+// NewForConfigOrDie creates a new Clientset for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *Clientset {
+	var cs Clientset
+	cs.zalandoV1 = zalandov1.NewForConfigOrDie(c)
+
+	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
+	return &cs
+}
+
+// New creates a new Clientset for the given RESTClient.
+func New(c rest.Interface) *Clientset {
+	var cs Clientset
+	cs.zalandoV1 = zalandov1.New(c)
+
+	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
+	return &cs
+}
--- a/Show More
+++ b/Show More