Rebase 1.18

.travis.yml

@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.12.1
+  - 1.13.5
 
 before_install:
   - sudo apt-get install libseccomp-dev -qq

Makefile

@@ -11,6 +11,10 @@
 OUT_DIR = _output
 OS_OUTPUT_GOPATH ?= 1
 
+GO111MODULE = off
+export GO111MODULE
+GOFLAGS ?= -mod=vendor
+
 export GOFLAGS
 export TESTFLAGS
 # If set to 1, create an isolated GOPATH inside _output using symlinks to avoid
@@ -84,7 +88,7 @@ verify-commits:
 #   make test-unit
 #   make test-unit WHAT=pkg/build TESTFLAGS=-v
 test-unit:
-	GOTEST_FLAGS="$(TESTFLAGS)" hack/test-go.sh $(WHAT) $(TESTS)
+	GO111MODULE="$(GO111MODULE)" GOTEST_FLAGS="$(TESTFLAGS)" hack/test-go.sh $(WHAT) $(TESTS)
 .PHONY: test-unit
 
 # Remove all build artifacts.
@@ -125,16 +129,16 @@ build-images: build-rpms
 
 .PHONY: lint
 lint: ## Go lint your code
-	hack/go-lint.sh -min_confidence 0.9 ./cluster-autoscaler/cloudprovider/openshiftmachineapi/...
+	hack/go-lint.sh -min_confidence 0.9 ./cluster-autoscaler/cloudprovider/clusterapi/...
 
 .PHONY: fmt
 fmt: ## Go fmt your code
-	hack/go-fmt.sh ./cluster-autoscaler/cloudprovider/openshiftmachineapi
+	hack/go-fmt.sh ./cluster-autoscaler/cloudprovider/clusterapi
 
 .PHONY: vet
 vet: ## Go fmt your code
-	hack/go-vet.sh ./cluster-autoscaler/cloudprovider/openshiftmachineapi
+	hack/go-vet.sh ./cluster-autoscaler/cloudprovider/clusterapi
 
 .PHONY: goimports
 goimports: ## Go fmt your code
-	hack/goimports.sh ./cluster-autoscaler/cloudprovider/openshiftmachineapi
+	hack/goimports.sh ./cluster-autoscaler/cloudprovider/clusterapi

OWNERS

@@ -1,12 +1,13 @@
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
 approvers:
-  - enxebre
-  - frobware
-  - ingvagabund
-  - JoelSpeed
+- enxebre
+- frobware
+- elmiko
+- alexander-demichev
+- JoelSpeed
 reviewers:
-  - enxebre
-  - frobware
-  - ingvagabund
-  - JoelSpeed
+- enxebre
+- frobware
+- elmiko
+- alexander-demichev
+- JoelSpeed
+

addon-resizer/Makefile

@@ -53,7 +53,7 @@ container: .container-$(ARCH)
         /bin/bash -c "\
             go get github.com/tools/godep && \
             cd /go/src/k8s.io/autoscaler/addon-resizer/ && \
-            CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) godep go build -a -installsuffix cgo --ldflags '-w' -o $(TEMP_DIR)/pod_nanny main.go"
+            CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) godep go build -a -installsuffix cgo --ldflags '-w -X k8s.io/autoscaler/addon-resizer/nanny.AddonResizerVersion=$(TAG)' -o $(TEMP_DIR)/pod_nanny main.go"
 
 	docker build -t $(MULTI_ARCH_IMG):$(TAG) $(TEMP_DIR)
 

addon-resizer/README.md

@@ -44,80 +44,7 @@ Usage of ./pod_nanny:
 
 ## Example deployment file
 
-The following yaml is an example deployment where the nanny watches and resizes itself.
-
-```yaml
-# Config map for resource configuration.
-# Specify 'cpu', 'extra-cpu', 'memory' and 'extra-memory'
-# to overwrite resource requirements.
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nanny-config
-  namespace: default
-data:
-  NannyConfiguration: |-
-    apiVersion: nannyconfig/v1alpha1
-    kind: NannyConfiguration
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: nanny-v1
-  namespace: default
-  labels:
-    k8s-app: nanny
-    version: v1
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      k8s-app: nanny
-      version: v1
-  template:
-    metadata:
-      labels:
-        k8s-app: nanny
-        version: v1
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-        - image: gcr.io/google-containers/addon-resizer-amd64:2.1
-          imagePullPolicy: Always
-          name: pod-nanny
-          resources:
-            limits:
-              cpu: 300m
-              memory: 200Mi
-            requests:
-              cpu: 300m
-              memory: 200Mi
-          env:
-            - name: MY_POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: MY_POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          volumeMounts:
-          - name: nanny-config-volume
-            mountPath: /etc/config
-          command:
-            - /pod_nanny
-            - --config-dir=/etc/config
-            - --cpu=300m
-            - --extra-cpu=20m
-            - --memory=200Mi
-            - --extra-memory=10Mi
-            - --threshold=5
-            - --deployment=nanny-v1
-      volumes:
-      - name: nanny-config-volume
-        configMap:
-          name: nanny-config
-```
+You can take a look at an [example deployment](./deploy/example.yaml) where the nanny watches and resizes itself.
 
 ## Addon resizer configuration
 

addon-resizer/deploy/example.yaml

@@ -0,0 +1,117 @@
+# Config map for resource configuration.
+# Specify 'cpu', 'extra-cpu', 'memory' and 'extra-memory'
+# to overwrite resource requirements.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nanny-config
+  namespace: default
+data:
+  NannyConfiguration: |-
+    apiVersion: nannyconfig/v1alpha1
+    kind: NannyConfiguration
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pod-nanny
+  namespace: default
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nanny-v1
+  namespace: default
+  labels:
+    k8s-app: nanny
+    version: v1
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      k8s-app: nanny
+      version: v1
+  template:
+    metadata:
+      labels:
+        k8s-app: nanny
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec:
+      serviceAccountName: pod-nanny
+      containers:
+        - image: gcr.io/bskiba-gke-dev/addon-resizer:1.8.7
+          imagePullPolicy: Always
+          name: pod-nanny
+          resources:
+            limits:
+              cpu: 300m
+              memory: 200Mi
+            requests:
+              cpu: 300m
+              memory: 200Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          volumeMounts:
+          - name: nanny-config-volume
+            mountPath: /etc/config
+          command:
+            - /pod_nanny
+            - --config-dir=/etc/config
+            - --cpu=300m
+            - --extra-cpu=20m
+            - --memory=200Mi
+            - --extra-memory=10Mi
+            - --threshold=5
+            - --deployment=nanny-v1
+      volumes:
+      - name: nanny-config-volume
+        configMap:
+          name: nanny-config
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: default:pod-nanny
+  namespace: default
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - "apps"
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pod-nanny-binding
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: default:pod-nanny
+subjects:
+- kind: ServiceAccount
+  name: pod-nanny
+  namespace: default
+---

addon-resizer/main.go

@@ -20,6 +20,7 @@ import (
 	"flag"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"syscall"
 	"time"
 
@@ -43,6 +44,8 @@ var (
 	memoryPerNode        = flag.String("extra-memory", "0Mi", "The amount of memory to add per node.")
 	baseStorage          = flag.String("storage", noValue, "The base storage resource requirement.")
 	storagePerNode       = flag.String("extra-storage", "0Gi", "The amount of storage to add per node.")
+	scaleDownDelay       = flag.Duration("scale-down-delay", time.Duration(0), "The time to wait after the addon-resizer start or last scaling operation before the scale down can be performed.")
+	scaleUpDelay         = flag.Duration("scale-up-delay", time.Duration(0), "The time to wait after the addon-resizer start or last scaling operation before the scale up can be performed.")
 	recommendationOffset = flag.Int("recommendation-offset", 10, "A number from range 0-100. When the dependent's resources are rewritten, they are set to the closer end of the range defined by this percentage threshold.")
 	acceptanceOffset     = flag.Int("acceptance-offset", 20, "A number from range 0-100. The dependent's resources are rewritten when they deviate from expected by a percentage that is higher than this threshold. Can't be lower than recommendation-offset.")
 	// Flags to identify the container to nanny.
@@ -66,7 +69,7 @@ func GetClientOrDie() kubernetes.Interface {
 	if err != nil {
 		log.Fatalf("Can not get kubernetes config: %v", err)
 	}
-
+	config.UserAgent = userAgent()
 	return kubernetes.NewForConfigOrDie(config)
 }
 
@@ -75,7 +78,23 @@ func buildOutOfClusterConfig() (*rest.Config, error) {
 	if kubeconfigPath == "" {
 		kubeconfigPath = os.Getenv("HOME") + "/.kube/config"
 	}
-	return clientcmd.BuildConfigFromFlags("", kubeconfigPath)
+	config, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
+	if err != nil {
+		return nil, err
+	}
+	config.UserAgent = userAgent()
+	return config, nil
+}
+
+func userAgent() string {
+	command := ""
+	if len(os.Args) > 0 && len(os.Args[0]) > 0 {
+		command = filepath.Base(os.Args[0])
+	}
+	if len(command) == 0 {
+		command = "addon-resizer"
+	}
+	return command + "/" + nanny.AddonResizerVersion
 }
 
 // GetClientOutOfClusterOrDie returns a k8s clientset to the request from outside of cluster
@@ -103,6 +122,7 @@ func main() {
 	checkPercentageFlagBounds("acceptance-offset", *acceptanceOffset)
 
 	pollPeriod := time.Duration(int64(*pollPeriodMillis) * int64(time.Millisecond))
+	log.Infof("Version: %s", nanny.AddonResizerVersion)
 	log.Infof("Poll period: %+v", pollPeriod)
 	log.Infof("Watching namespace: %s, pod: %s, container: %s.", *podNamespace, *podName, *containerName)
 	log.Infof("cpu: %s, extra_cpu: %s, memory: %s, extra_memory: %s, storage: %s, extra_storage: %s", *baseCPU, *cpuPerNode, *baseMemory, *memoryPerNode, *baseStorage, *storagePerNode)
@@ -166,5 +186,7 @@ func main() {
 			RecommendationOffset: int64(*recommendationOffset),
 			Resources:            resources,
 		},
-		pollPeriod)
+		pollPeriod,
+		*scaleDownDelay,
+		*scaleUpDelay)
 }