Update to upstream latest

.github/ISSUE_TEMPLATE/vpa_release.md

@@ -0,0 +1,17 @@
+---
+name: VPA release
+about: Create an issue for tracking VPA release
+title: 'VPA release X.Y.Z'
+labels: 'vertical-pod-autoscaler'
+assignees: ''
+
+---
+
+Please follow instructions in
+[RELEASE.md](https://github.com/kubernetes/autoscaler/blob/master/vertical-pod-autoscaler/RELEASE.md) and note each
+completed step on this issue.
+
+Please provide any information that is related to the release:
+
+- When we plan to do the release?
+- Are there any issues / PRs blocking the release?

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,61 @@
+#### What type of PR is this?
+
+<!--
+Add one of the following kinds:
+/kind bug
+/kind cleanup
+/kind documentation
+/kind feature
+
+Optionally add one or more of the following kinds if applicable:
+/kind api-change
+/kind deprecation
+/kind failing-test
+/kind flake
+/kind regression
+-->
+
+#### What this PR does / why we need it:
+
+#### Which issue(s) this PR fixes:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
+-->
+Fixes #
+
+#### Special notes for your reviewer:
+
+#### Does this PR introduce a user-facing change?
+<!--
+If no, just write "NONE" in the release-note block below.
+If yes, a release note is required:
+Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
+
+For more information on release notes see: https://git.k8s.io/community/contributors/guide/release-notes.md
+-->
+```release-note
+
+```
+
+#### Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:
+
+<!--
+This section can be blank if this pull request does not require a release note.
+
+When adding links which point to resources within git repositories, like
+KEPs or supporting documentation, please reference a specific commit and avoid
+linking directly to the master branch. This ensures that links reference a
+specific point in time, rather than a document that may change over time.
+
+See here for guidance on getting permanent links to files: https://help.github.com/en/articles/getting-permanent-links-to-files
+
+Please use the following format for linking documentation:
+- [KEP]: <link>
+- [Usage]: <link>
+- [Other doc]: <link>
+-->
+```docs
+
+```

.github/dependabot.yml

@@ -0,0 +1,36 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/vertical-pod-autoscaler"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 0 # setting this to 0 means only allowing security updates, see https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit
+  labels:
+    - "vertical-pod-autoscaler"
+- package-ecosystem: docker
+  directory: "/vertical-pod-autoscaler/pkg/recommender"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 3
+  labels:
+    - "vertical-pod-autoscaler"
+- package-ecosystem: docker
+  directory: "/vertical-pod-autoscaler/pkg/updater"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 3
+  labels:
+    - "vertical-pod-autoscaler"
+- package-ecosystem: docker
+  directory: "/vertical-pod-autoscaler/pkg/admission-controller"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 3
+  labels:
+    - "vertical-pod-autoscaler"
+- package-ecosystem: gomod
+  directory: "/addon-resizer"
+  schedule:
+    interval: daily
+  target-branch: "addon-resizer-release-1.8"
+  open-pull-requests-limit: 3

.github/workflows/ci.yaml

@@ -7,14 +7,17 @@ on:
 env:
   GOPATH: ${{ github.workspace }}/go
 
+permissions:
+  contents: read
+
 jobs:
   test-and-verify:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: '1.22.1'
 
       - uses: actions/checkout@v2
         with:
@@ -26,11 +29,17 @@ jobs:
       - name: Prepare
         working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
         run: hack/install-verify-tools.sh
+        env:
+          GO111MODULE: auto
 
       - name: Verify
         working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
         run: hack/verify-all.sh -v
+        env:
+          GO111MODULE: auto
 
       - name: Test
         working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
         run: hack/for-go-proj.sh test
+        env:
+          GO111MODULE: auto

.github/workflows/pr.yaml

@@ -1,5 +1,11 @@
+permissions:
+  contents: read
+
 jobs:
   changes:
+    permissions:
+      contents: read  # for dorny/paths-filter to fetch a list of changed files
+      pull-requests: read  # for dorny/paths-filter to read pull requests
     outputs:
       charts: ${{ steps.filter.outputs.charts }}
     runs-on: ubuntu-latest
@@ -35,7 +41,7 @@ jobs:
         run: |
           changed=$(ct list-changed)
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
+            echo "changed=true" >> $GITHUB_OUTPUT
           fi
       - if: steps.list-changed.outputs.changed == 'true'
         name: Create kind cluster

.github/workflows/release.yaml

@@ -1,5 +1,10 @@
+permissions:
+  contents: read
+
 jobs:
   release:
+    permissions:
+      contents: write  # for helm/chart-releaser-action to push chart release and create a release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.gitignore

@@ -15,6 +15,7 @@
 
 # VSCode project files
 **/.vscode
+*.code-workspace
 
 # Emacs save files
 *~
@@ -28,3 +29,5 @@
 Session.vim
 .netrwhist
 
+# Binary files
+bin/

OWNERS

@@ -1,8 +1,10 @@
 approvers:
 - mwielgus
 - maciekpytel
-- bskiba
+- gjtempleton
 reviewers:
 - mwielgus
 - maciekpytel
-- bskiba
+- gjtempleton
+emeritus_approvers:
+- bskiba # 2022-09-30

README.md

@@ -1,6 +1,6 @@
 # Kubernetes Autoscaler
 
-[![Build Status](https://travis-ci.org/kubernetes/autoscaler.svg?branch=master)](https://travis-ci.org/kubernetes/autoscaler) [![GoDoc Widget]][GoDoc]
+[![Release Charts](https://github.com/kubernetes/autoscaler/actions/workflows/release.yaml/badge.svg)](https://github.com/kubernetes/autoscaler/actions/workflows/release.yaml) [![Tests](https://github.com/kubernetes/autoscaler/actions/workflows/ci.yaml/badge.svg)](https://github.com/kubernetes/autoscaler/actions/workflows/ci.yaml) [![GoDoc Widget]][GoDoc]
 
 This repository contains autoscaling-related components for Kubernetes.
 

addon-resizer/Makefile

@@ -27,6 +27,8 @@ IMGNAME = addon-resizer
 IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 TAG = 2.3
+# The output type could either be docker (local), or registry.
+OUTPUT_TYPE ?= docker
 
 BASEIMAGE?=gcr.io/distroless/static:latest
 
@@ -37,14 +39,24 @@ all: all-container
 sub-container-%:
 	$(MAKE) ARCH=$* container
 
+sub-manifest-push-%:
+	$(MAKE) ARCH=$* manifest-push
+
 sub-push-%:
 	$(MAKE) ARCH=$* push
 
 all-container: test $(addprefix sub-container-,$(ALL_ARCH))
 
-all-push: $(addprefix sub-push-,$(ALL_ARCH))
+all-manifest-push: $(addprefix sub-manifest-push-,$(ALL_ARCH))
+	docker manifest push -p $(IMAGE):$(TAG)
+
+all-push: $(addprefix sub-push-,$(ALL_ARCH)) all-manifest-push
+
+buildx-setup:
+	docker buildx inspect img-builder > /dev/null || docker buildx create --name img-builder --use
+
 container: .container-$(ARCH)
-.container-$(ARCH):
+.container-$(ARCH): buildx-setup
 	cp -r * $(TEMP_DIR)
 	cd $(TEMP_DIR) && sed -i 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
 
@@ -55,7 +67,11 @@ container: .container-$(ARCH)
             cd /go/src/k8s.io/autoscaler/addon-resizer/ && \
             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)
+	docker buildx build \
+		--pull \
+		--platform linux/$(ARCH) \
+		--output=type=$(OUTPUT_TYPE) \
+		-t $(MULTI_ARCH_IMG):$(TAG) $(TEMP_DIR)
 
 ifeq ($(ARCH), amd64)
 	# This is for to maintain the backward compatibility
@@ -77,6 +93,11 @@ ifeq ($(ARCH), amd64)
 	gcloud docker -- push $(IMAGE):$(TAG)
 endif
 
+manifest-push: .manifest-push-$(ARCH)
+.manifest-push-$(ARCH):
+	docker manifest create --amend $(IMAGE):$(TAG) $(MULTI_ARCH_IMG):$(TAG) && \
+	docker manifest annotate --os=linux --arch=$(ARCH) $(IMAGE):$(TAG) $(MULTI_ARCH_IMG):$(TAG)
+
 clean: $(addprefix sub-clean-,$(ALL_ARCH))
 sub-clean-%:
 	docker rmi -f $(IMAGE)-$*:$(TAG) || true

addon-resizer/OWNERS

@@ -1,6 +1,11 @@
 approvers:
-- bskiba
-- wojtek-t
+- kwiesmueller
+- jbartosik
 reviewers:
-- bskiba
-- wojtek-t
+- kwiesmueller
+- jbartosik
+emeritus_approvers:
+- bskiba # 2022-09-30
+- wojtek-t # 2022-09-30
+labels:
+- area/addon-resizer

addon-resizer/README.md

@@ -5,11 +5,11 @@ vertically scales the dependent container up and down. Currently the only
 option is to scale it linearly based on the number of nodes, and it only works
 for a singleton.
 
-Currently recommended version is 1.8, on addon-resizer-release-1.8 branch. The latest version and Docker images are 2.1 pushed to:
+Currently recommended version is 1.8, on addon-resizer-release-1.8 branch. The latest version and Docker images are 2.3 pushed to:
 
-* gcr.io/google-containers/addon-resizer-amd64:2.1
-* gcr.io/google-containers/addon-resizer-arm64:2.1
-* gcr.io/google-containers/addon-resizer-arm:2.1
+* gcr.io/google-containers/addon-resizer-amd64:2.3
+* gcr.io/google-containers/addon-resizer-arm64:2.3
+* gcr.io/google-containers/addon-resizer-arm:2.3
 
 ## Nanny program and arguments
 

addon-resizer/deploy/example.yaml

@@ -41,7 +41,7 @@ spec:
     spec:
       serviceAccountName: pod-nanny
       containers:
-        - image: k8s.gcr.io/addon-resizer:1.8.7
+        - image: registry.k8s.io/autoscaling/addon-resizer:1.8.14
           imagePullPolicy: Always
           name: pod-nanny
           resources:
@@ -79,6 +79,37 @@ spec:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
+metadata:
+  name: default:pod-nanny
+rules:
+### --use-metrics=false
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - list
+### --use-metrics=true
+# - nonResourceURLs:
+#   - /metrics
+#   verbs:
+#   - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pod-nanny-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: default:pod-nanny
+subjects:
+- kind: ServiceAccount
+  name: pod-nanny
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
   name: default:pod-nanny
   namespace: default
@@ -87,33 +118,28 @@ rules:
   - ""
   resources:
   - pods
-  - nodes
   verbs:
   - get
-  - list
-  - watch
 - apiGroups:
   - "apps"
   resources:
   - deployments
+  resourceNames:
+  - nanny-v1
   verbs:
   - get
-  - list
-  - update
-  - watch
   - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
 metadata:
   name: pod-nanny-binding
   namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: default:pod-nanny
 subjects:
 - kind: ServiceAccount
   name: pod-nanny
-  namespace: default
 ---