add missing VERSION file

Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>

.github/workflows/ci.yaml

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

.github/workflows/codeql-analysis.yml

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

.gitignore

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

.travis.yml

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

Dockerfile

@@ -1,8 +1,6 @@
-FROM registry.opensource.zalan.do/library/alpine-3.13:latest
+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
-
 # add binary
 ADD build/linux/kube-metrics-adapter /
 

Makefile

@@ -10,10 +10,6 @@ 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
@@ -22,22 +18,14 @@ clean:
 	rm -rf build
 	rm -rf $(OPENAPI)
 
-test: $(GENERATED)
+test:
-	go test -v -coverprofile=profile.cov $(GOPKGS)
+	go test -v $(GOPKGS)
 
-check: $(GENERATED)
+check:
 	go mod download
 	golangci-lint run --timeout=2m ./...
 
 
-$(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 \
@@ -48,17 +36,17 @@ $(OPENAPI): go.mod
 		-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) $(OPENAPI)
 	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) $(OPENAPI)
 	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) $(OPENAPI)
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/osx/$(BINARY) -ldflags "$(LDFLAGS)" .
 
 build.docker: build.linux

VERSION

@@ -0,0 +1 @@
+v0.1

delivery.yaml

@@ -1,9 +1,7 @@
 version: "2017-09-20"
 pipeline:
 - id: build
-  vm_config:
+  overlay: ci/golang
-    type: linux
-    image: "cdp-runtime/go"
   cache:
     paths:
     - /go/pkg/mod       # pkg cache for Go modules
@@ -22,7 +20,15 @@ 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)
+        LATEST_VERSION=$(git describe --tags --always | awk -F \- '{print $1}')
+        CUR_PART=$(echo $LATEST_VERSION | awk -F . '{print $1"."$2}')
+        VERSION_PART=$(cat VERSION)
+        OLD_PATCH=$(echo $LATEST_VERSION | awk -F . '{print $3}')
+        NEW_PATCH=$((OLD_PATCH + 1))
+        if [ "$CUR_PART" != "$VERSION_PART" ]; then NEW_PATCH=0; fi
+        VERSION=${VERSION_PART}.${NEW_PATCH}
+        echo "Creating release for tag: ${VERSION}"
+
       else
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-metrics-adapter-test
         VERSION=$CDP_BUILD_VERSION
@@ -30,3 +36,18 @@ pipeline:
       IMAGE=$IMAGE VERSION=$VERSION make build.docker
       git diff --stat --exit-code
       IMAGE=$IMAGE VERSION=$VERSION make build.push
+      if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
+        echo "create release page"
+        tf=$(mktemp)
+        echo -e "### Changes\n" >$tf
+        git log -1 --pretty=%B | grep -v 'Signed-off-by:' | grep -v -E '^\s*$' | grep -vE '^\*' >>$tf
+        echo -e "\n### Docker image\n" >>$tf
+        echo -e "Docker image is available in Zalando's Open Source registry:\n" >>$tf
+        echo -e '```' >>$tf
+        echo -e "docker run -it registry.opensource.zalan.do/teapot/kube-metrics-adapter:${VERSION} --help" >>$tf
+        echo -e '```' >>$tf
+        echo "################################"
+        cat $tf
+        echo "################################"
+        git gh-release --message-from-file "${tf}" $VERSION
+      fi

docs/cluster_scaling_schedules_crd.yaml

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

docs/custom-metrics-apiservice.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiregistration.k8s.io/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,6 +1,6 @@
 apiVersion: v2
 name: kube-metrics-adapter
-version: 0.1.18
+version: 0.1.9
 description: kube-metrics-adapter helm chart
 home: https://github.com/zalando-incubator/kube-metrics-adapter
 maintainers:

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,5 +1,5 @@
 {{- if .Values.enableCustomMetricsApi }}
-apiVersion: apiregistration.k8s.io/v1
+apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
   name: v1beta1.custom.metrics.k8s.io
@@ -12,4 +12,4 @@ spec:
   insecureSkipTLSVerify: {{ .Values.tls.skipTLSVerify }}
   groupPriorityMinimum: 100
   versionPriority: 100
-{{- end}}
+{{- end}}

docs/helm/templates/deployment.yaml

@@ -16,23 +16,8 @@ spec:
       labels:
         application: kube-metrics-adapter
         version: {{ .Values.registry.imageTag }}
-      {{- if .Values.podAnnotations }}
-      annotations: {{- toYaml .Values.podAnnotations | nindent 8 }}
-      {{- end }}
     spec:
       serviceAccountName: kube-metrics-adapter
-    {{- if .Values.nodeSelector }}
-      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
-    {{- end }}
-    {{- if .Values.tolerations }}
-      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
-    {{- end }}
-    {{- if .Values.affinity }}
-      affinity: {{ toYaml .Values.affinity | nindent 8 }}
-    {{- end }}
-    {{- if .Values.priorityClassName }}
-      priorityClassName: {{ .Values.priorityClassName | quote }}
-    {{- end }}
       containers:
         - name: kube-metrics-adapter
           image: {{ .Values.registry.image}}:{{ .Values.registry.imageTag }}
@@ -197,9 +182,6 @@ spec:
             {{- 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 }}

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

@@ -1,5 +1,5 @@
 {{- if .Values.enableExternalMetricsApi }}
-apiVersion: apiregistration.k8s.io/v1
+apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
   name: v1beta1.external.metrics.k8s.io

docs/helm/templates/rbac.yaml

@@ -60,7 +60,7 @@ rules:
   verbs:
   - get
 - apiGroups:
-  - networking.k8s.io
+  - extensions
   resources:
   - ingresses
   verbs:
@@ -73,17 +73,6 @@ rules:
   - 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

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/values.yaml

@@ -4,7 +4,7 @@ replicas: 1
 
 registry:
   image: registry.opensource.zalan.do/teapot/kube-metrics-adapter
-  imageTag: v0.1.10
+  imageTag: v0.1.9
   imagePullPolicy: IfNotPresent
 
 service:
@@ -92,17 +92,3 @@ resources:
   requests:
     cpu: 100m
     memory: 100Mi
-
-scalingSchedule:
-  enabled: false
-
-nodeSelector:
-  kubernetes.io/os: linux
-
-tolerations: []
-
-affinity: {}
-
-priorityClassName: ""
-
-podAnnotations: {}

docs/rbac.yaml

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

example/Dockerfile

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

example/deploy/hpa.yaml

@@ -39,7 +39,7 @@ spec:
   - type: Object
     object:
       describedObject:
-        apiVersion: networking.k8s.io/v1
+        apiVersion: extensions/v1beta1
         kind: Ingress
         name: custom-metrics-consumer
       metric:

example/deploy/ingress.yaml

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

example/main.go

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

go.mod

@@ -1,123 +1,36 @@
 module github.com/zalando-incubator/kube-metrics-adapter
 
 require (
-	github.com/aws/aws-sdk-go v1.44.25
+	github.com/NYTimes/gziphandler v1.0.1 // indirect
+	github.com/aws/aws-sdk-go v1.36.19
+	github.com/go-openapi/spec v0.20.0
+	github.com/googleapis/gnostic v0.2.0 // indirect
 	github.com/influxdata/influxdb-client-go v0.2.0
-	github.com/kubernetes-sigs/custom-metrics-apiserver v0.0.0-20201216091021-1b9fa998bbaa
+	github.com/influxdata/line-protocol v0.0.0-20201012155213-5f565037cbc9 // indirect
-	github.com/prometheus/client_golang v1.12.2
+	github.com/kubernetes-incubator/custom-metrics-apiserver v0.0.0-20201023074945-51cc7b53320e
-	github.com/prometheus/common v0.34.0
+	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/sirupsen/logrus v1.8.1
+	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/spf13/cobra v1.4.0
+	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/spyzhov/ajson v0.7.1
+	github.com/prometheus/client_golang v1.9.0
-	github.com/stretchr/testify v1.7.1
+	github.com/prometheus/common v0.15.0
-	github.com/szuecs/routegroup-client v0.21.0
+	github.com/sirupsen/logrus v1.7.0
-	github.com/zalando-incubator/cluster-lifecycle-manager v0.0.0-20220201095549-bbdeecaa4fc1
+	github.com/spf13/cobra v0.0.7
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
+	github.com/spyzhov/ajson v0.4.2
-	k8s.io/api v0.23.0
+	github.com/stretchr/testify v1.6.1
-	k8s.io/apimachinery v0.23.0
+	github.com/zalando-incubator/cluster-lifecycle-manager v0.0.0-20180921141935-824b77fb1f84
-	k8s.io/apiserver v0.23.0
+	golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 // indirect
-	k8s.io/client-go v0.23.0
+	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
-	k8s.io/code-generator v0.23.0
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	k8s.io/component-base v0.23.0
+	golang.org/x/tools v0.0.0-20200204192400-7124308813f3 // indirect
+	honnef.co/go/tools v0.0.1-2020.1.3 // indirect
+	k8s.io/api v0.18.14
+	k8s.io/apimachinery v0.18.14
+	k8s.io/apiserver v0.18.14
+	k8s.io/client-go v0.18.14
+	k8s.io/component-base v0.18.14
 	k8s.io/klog v1.0.0
-	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
+	k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
-	k8s.io/metrics v0.21.9
+	k8s.io/metrics v0.18.8
-	sigs.k8s.io/controller-tools v0.8.0
 )
 
-require (
+go 1.15
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful v2.14.3+incompatible // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/felixge/httpsnoop v1.0.2 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-logr/logr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/gobuffalo/flect v0.2.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/spf13/afero v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.0 // indirect
-	go.opentelemetry.io/contrib v0.20.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
-	go.opentelemetry.io/otel v0.20.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
-	go.opentelemetry.io/otel/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/trace v0.20.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/tools v0.1.9 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.43.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apiextensions-apiserver v0.23.0 // indirect
-	k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
-	k8s.io/klog/v2 v2.40.1 // indirect
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
-	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
-)
-
-go 1.18

hack/tools.go

@@ -1,23 +1,6 @@
 // +build tools
 
-/*
-Copyright 2019 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.
-*/
-
 // This package imports things required by build scripts, to force `go mod` to see them as dependencies
 package tools
 
-import (
+import _ "k8s.io/kube-openapi/cmd/openapi-gen"
-	_ "k8s.io/code-generator"
-	_ "k8s.io/kube-openapi/cmd/openapi-gen"
-	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
-)