Release v9.3.6 (#2957)

* Bump version to 9.3.2-dev (#2858) Co-authored-by: GitHub Action <[email protected]> * Bump golang from 1.15.4 to 1.15.5 (#2859) * Bump golang from 1.15.4 to 1.15.5 Bumps golang from 1.15.4 to 1.15.5. Signed-off-by: dependabot[bot] <[email protected]> * Fix go modules Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump github.com/google/go-cmp from 0.5.2 to 0.5.3 (#2861) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump github.com/giantswarm/apiextensions/v3 from 3.7.0 to 3.8.0 (#2860) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump github.com/aws/aws-sdk-go from 1.35.23 to 1.35.28 (#2862) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Align files (#2863) Co-authored-by: github-actions <[email protected]> * use alike instances injected from the installations repo (#2864) * Bump github.com/aws/aws-sdk-go from 1.35.28 to 1.35.33 (#2866) * Bump github.com/aws/aws-sdk-go from 1.35.28 to 1.35.33 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.35.28 to 1.35.33. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.35.28...v1.35.33) Signed-off-by: dependabot[bot] <[email protected]> * Fix go modules Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump sigs.k8s.io/controller-runtime from 0.6.3 to 0.6.4 (#2867) * Bump sigs.k8s.io/controller-runtime from 0.6.3 to 0.6.4 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.6.3 to 0.6.4. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Commits](kubernetes-sigs/controller-runtime@v0.6.3...v0.6.4) Signed-off-by: dependabot[bot] <[email protected]> * Fix go modules Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * vaclav-bump-k8scc-to-9-1-2 (#2868) * fix-naming-for-node-termination (#2869) * vaclav-bump-k8scc-9-1-3 (#2871) * Release v9.3.2 (#2872) Co-authored-by: github-actions <[email protected]> * Bump version to 9.3.3-dev (#2873) Co-authored-by: GitHub Action <[email protected]> * Bump github.com/google/go-cmp from 0.5.3 to 0.5.4 (#2876) Bumps [github.com/google/go-cmp](https://github.com/google/go-cmp) from 0.5.3 to 0.5.4. - [Release notes](https://github.com/google/go-cmp/releases) - [Commits](google/go-cmp@v0.5.3...v0.5.4) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/aws/aws-sdk-go from 1.35.33 to 1.35.35 (#2877) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.35.33 to 1.35.35. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.35.33...v1.35.35) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update k8scloudconfig (#2878) * Update k8scloudconfig * Fix import * Release v9.3.3 (#2879) * Release v9.3.3 * add changelog Co-authored-by: github-actions <[email protected]> Co-authored-by: calvix <[email protected]> * Bump version to 9.3.4-dev (#2880) Co-authored-by: GitHub Action <[email protected]> * Bump github.com/giantswarm/apiextensions/v3 from 3.8.0 to 3.9.0 (#2875) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Using new micrologger 0.4.0 (#2882) * update go.mod * update debug functions & sorting go import * sort go imports * Bump golang from 1.15.5 to 1.15.6 (#2883) Bumps golang from 1.15.5 to 1.15.6. Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/giantswarm/microerror from 0.2.1 to 0.3.0 (#2887) * Bump github.com/giantswarm/microerror from 0.2.1 to 0.3.0 Bumps [github.com/giantswarm/microerror](https://github.com/giantswarm/microerror) from 0.2.1 to 0.3.0. - [Release notes](https://github.com/giantswarm/microerror/releases) - [Changelog](https://github.com/giantswarm/microerror/blob/master/CHANGELOG.md) - [Commits](giantswarm/microerror@v0.2.1...v0.3.0) Signed-off-by: dependabot[bot] <[email protected]> * Fix go modules Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump github.com/aws/amazon-vpc-cni-k8s from 1.7.5 to 1.7.6 (#2886) * Bump github.com/aws/amazon-vpc-cni-k8s from 1.7.5 to 1.7.6 Bumps [github.com/aws/amazon-vpc-cni-k8s](https://github.com/aws/amazon-vpc-cni-k8s) from 1.7.5 to 1.7.6. - [Release notes](https://github.com/aws/amazon-vpc-cni-k8s/releases) - [Changelog](https://github.com/aws/amazon-vpc-cni-k8s/blob/master/CHANGELOG.md) - [Commits](aws/amazon-vpc-cni-k8s@v1.7.5...v1.7.6) Signed-off-by: dependabot[bot] <[email protected]> * Fix go modules Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> * Bump github.com/giantswarm/apiextensions/v3 from 3.11.0 to 3.12.0 (#2884) Bumps [github.com/giantswarm/apiextensions/v3](https://github.com/giantswarm/apiextensions) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/giantswarm/apiextensions/releases) - [Changelog](https://github.com/giantswarm/apiextensions/blob/master/CHANGELOG.md) - [Commits](giantswarm/apiextensions@v3.11.0...v3.12.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/aws/aws-sdk-go from 1.35.35 to 1.36.2 (#2885) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Jüttner <[email protected]> * bump-k8scc-to-9-3-0 (#2889) * enable vpa for aws-operator (#2881) * enable vpa for aws-operator * enable vpa for aws-operator * enable vpa for aws-operator * Release v9.3.4 (#2890) Co-authored-by: github-actions <[email protected]> * Bump version to 9.3.5-dev (#2891) Co-authored-by: GitHub Action <[email protected]> * drop go mod tidy workflow (#2888) * Align files (#2894) Co-authored-by: github-actions <[email protected]> * do-not-return-deleted-nat-gateways (#2892) * Release v9.3.5 (#2895) Co-authored-by: github-actions <[email protected]> * Added CNI CIDR to internal ELB * fix tests * Check if the cluster is using the default CIDR * change version * regenerate tests * improve description * fix tests * change version * update version to final * Release v9.3.6 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> Co-authored-by: ArchitectBot <[email protected]> Co-authored-by: Tim Schindler <[email protected]> Co-authored-by: calvix <[email protected]> Co-authored-by: Bricktop <[email protected]> Co-authored-by: Jihyuk Bok <[email protected]> Co-authored-by: Nick Jüttner <[email protected]> Co-authored-by: Pau Rosello <[email protected]> Co-authored-by: paurosello <[email protected]>
giantswarm · Feb 2, 2021 · db26f2e · db26f2e
1 parent 8f79a99
commit db26f2e
Show file tree

Hide file tree

Showing 109 changed files with 1,056 additions and 1,091 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,34 +1,34 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl gen dependabot
+#    devctl@4.0.0
 #
 version: 2
 updates:
-- package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "04:00"
-  target-branch: master
-  reviewers:
-  - giantswarm/team-firecracker-engineers
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "04:00"
-  target-branch: master
-  reviewers:
-  - giantswarm/team-firecracker-engineers
-- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "04:00"
-  open-pull-requests-limit: 10
-  reviewers:
-  - giantswarm/team-firecracker-engineers
-  ignore:
-  - dependency-name: k8s.io/*
-    versions:
-    - ">=0.19.0"
+  - package-ecosystem: docker
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "04:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - giantswarm/team-firecracker-engineers
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "04:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - giantswarm/team-firecracker-engineers
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "04:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - giantswarm/team-firecracker-engineers
+    ignore:
+      - dependency-name: k8s.io/*
+        versions:
+          - ">=0.19.0"
diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl gen workflows
+#    devctl@4.0.0
 #
 name: Create Release
 on:
@@ -196,8 +196,14 @@ jobs:
       - name: Create long-lived release branch
         run: |
           current_version="${{ needs.gather_facts.outputs.version }}"
-          parent_version="$(git describe --tags --abbrev=0 HEAD^)"
+          parent_version="$(git describe --tags --abbrev=0 HEAD^ || true)"
           parent_version="${parent_version#v}" # Strip "v" prefix.
+
+          if [[ -z "$parent_version" ]] ; then
+            echo "Unable to find a parent tag version. No branch to create."
+            exit 0
+          fi
+
           echo "current_version=$current_version parent_version=$parent_version"
 
           current_major=$(semver get major $current_version)

diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl gen workflows
+#    devctl@4.0.0
 #
 name: Create Release PR
 on:

diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml
@@ -0,0 +1,17 @@
+# DO NOT EDIT. Generated with:
+#
+#    [email protected]
+#
+name: gitleaks
+
+on: [push,pull_request]
+
+jobs:
+  gitleaks:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: '0'
+    - name: gitleaks-action
+      uses: zricethezav/[email protected]
diff --git a/.github/workflows/zz_generated.gomodtidy.yaml b/.github/workflows/zz_generated.gomodtidy.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [9.3.6] - 2021-02-02
+
+### Fixed
+
+- Added CNI CIDR to internal ELB Security Group.
+
+## [9.3.5] - 2020-12-08
+
+### Changed
+
+- Do not return NAT gateways in state `deleting` and `deleted` to avoid problems with recreating clusters with same ID.
+
+## [9.3.4] - 2020-12-07
+
+### Added
+
+- Add vertical pod autoscaler support.
+- Update `k8scloudconfig` version to `v9.3.0` to include change for cgroup for kubelet.
+
+## [9.3.3] - 2020-12-02
+### Changed
+
+- Update `k8scloudconfig` version to `v9.2.0` to include change for kubelet pull QPS.
+
+## [9.3.2] - 2020-11-26
+
+### Changed
+
+- Make it mandatory to configure alike instances via e.g. the installations repo.
+- Fix naming and logs for `terminate-unhealthy-node` feature.
+
 ## [9.3.1-fix] - 2020-12-24
 
 ### Changed
@@ -334,7 +365,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-[Unreleased]: https://github.com/giantswarm/aws-operator/compare/v9.3.1-fix...HEAD
+[9.3.6]: https://github.com/giantswarm/aws-operator/compare/v9.3.5...v9.3.6
+[9.3.5]: https://github.com/giantswarm/aws-operator/compare/v9.3.4...v9.3.5
+[9.3.4]: https://github.com/giantswarm/aws-operator/compare/v9.3.3...v9.3.4
+[9.3.3]: https://github.com/giantswarm/aws-operator/compare/v9.3.2...v9.3.3
+[9.3.2]: https://github.com/giantswarm/aws-operator/compare/v9.3.1...v9.3.2
 [9.3.1-fix]: https://github.com/giantswarm/aws-operator/compare/v9.3.1...v9.3.1-fix
 [9.3.1]: https://github.com/giantswarm/aws-operator/compare/v9.3.0...v9.3.1
 [9.3.0]: https://github.com/giantswarm/aws-operator/compare/v9.2.0...v9.3.0

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.4 AS builder
+FROM golang:1.15.6 AS builder
 ENV GO111MODULE=on
 COPY go.mod /etc/go.mod
 RUN cat /etc/go.mod | grep k8scloudconfig | awk '{print $1"/...@"$2}' | xargs -I{} go get {}

diff --git a/Makefile b/Makefile
@@ -1,103 +1,12 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl gen makefile
+#    devctl@4.0.0
 #
 
-APPLICATION    := $(shell go list . | cut -d '/' -f 3)
-BUILDTIMESTAMP := $(shell date -u '+%FT%TZ')
-GITSHA1        := $(shell git rev-parse --verify HEAD)
-OS             := $(shell go env GOOS)
-SOURCES        := $(shell find . -name '*.go')
-VERSION        := $(shell architect project version)
-LDFLAGS        ?= -w -linkmode 'auto' -extldflags '-static' \
-  -X '$(shell go list .)/pkg/project.buildTimestamp=${BUILDTIMESTAMP}' \
-  -X '$(shell go list .)/pkg/project.gitSHA=${GITSHA1}'
-.DEFAULT_GOAL := build
-
-.PHONY: build build-darwin build-linux
-## build: builds a local binary
-build: $(APPLICATION)
-	@echo "====> $@"
-## build-darwin: builds a local binary for darwin/amd64
-build-darwin: $(APPLICATION)-darwin
-	@echo "====> $@"
-## build-linux: builds a local binary for linux/amd64
-build-linux: $(APPLICATION)-linux
-	@echo "====> $@"
-
-$(APPLICATION): $(APPLICATION)-v$(VERSION)-$(OS)-amd64
-	@echo "====> $@"
-	cp -a $< $@
-
-$(APPLICATION)-darwin: $(APPLICATION)-v$(VERSION)-darwin-amd64
-	@echo "====> $@"
-	cp -a $< $@
-
-$(APPLICATION)-linux: $(APPLICATION)-v$(VERSION)-linux-amd64
-	@echo "====> $@"
-	cp -a $< $@
-
-$(APPLICATION)-v$(VERSION)-%-amd64: $(SOURCES)
-	@echo "====> $@"
-	CGO_ENABLED=0 GOOS=$* GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o $@ .
-
-.PHONY: install
-## install: install the application
-install:
-	@echo "====> $@"
-	go install -ldflags "$(LDFLAGS)" .
-
-.PHONY: run
-## run: runs go run main.go
-run:
-	@echo "====> $@"
-	go run -ldflags "$(LDFLAGS)" -race .
-
-.PHONY: clean
-## clean: cleans the binary
-clean:
-	@echo "====> $@"
-	rm -f $(APPLICATION)*
-	go clean
-
-.PHONY: imports
-## imports: runs goimports
-imports:
-	@echo "====> $@"
-	goimports -local $(shell go list .) -w .
-
-.PHONY: lint
-## lint: runs golangci-lint
-lint:
-	@echo "====> $@"
-	golangci-lint run -E gosec -E goconst --timeout=15m ./...
-
-.PHONY: test
-## test: runs go test with default values
-test:
-	@echo "====> $@"
-	go test -ldflags "$(LDFLAGS)" -race ./...
-
-.PHONY: build-docker
-## build-docker: builds docker image to registry
-build-docker: build-linux
-	@echo "====> $@"
-	docker build -t ${APPLICATION}:${VERSION} .
-
-.PHONY: lint-chart
-## lint-chart: runs ct against the default chart
-lint-chart: IMAGE := giantswarm/helm-chart-testing:v3.0.0-rc.1
-lint-chart:
-	@echo "====> $@"
-	rm -rf /tmp/$(APPLICATION)-test
-	mkdir -p /tmp/$(APPLICATION)-test/helm
-	cp -a ./helm/$(APPLICATION) /tmp/$(APPLICATION)-test/helm/
-	architect helm template --dir /tmp/$(APPLICATION)-test/helm/$(APPLICATION)
-	docker run -it --rm -v /tmp/$(APPLICATION)-test:/wd --workdir=/wd --name ct $(IMAGE) ct lint --validate-maintainers=false --charts="helm/$(APPLICATION)"
-	rm -rf /tmp/$(APPLICATION)-test
+include Makefile.*.mk
 
 .PHONY: help
 ## help: prints this help message
 help:
 	@echo "Usage: \n"
-	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' |  sed -e 's/^/ /'
+	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' |  sed -e 's/^/ /' | sort
diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk
@@ -0,0 +1,16 @@
+# DO NOT EDIT. Generated with:
+#
+#    [email protected]
+#
+
+.PHONY: lint-chart
+## lint-chart: runs ct against the default chart
+lint-chart: IMAGE := giantswarm/helm-chart-testing:v3.0.0-rc.1
+lint-chart:
+	@echo "====> $@"
+	rm -rf /tmp/$(APPLICATION)-test
+	mkdir -p /tmp/$(APPLICATION)-test/helm
+	cp -a ./helm/$(APPLICATION) /tmp/$(APPLICATION)-test/helm/
+	architect helm template --dir /tmp/$(APPLICATION)-test/helm/$(APPLICATION)
+	docker run -it --rm -v /tmp/$(APPLICATION)-test:/wd --workdir=/wd --name ct $(IMAGE) ct lint --validate-maintainers=false --charts="helm/$(APPLICATION)"
+	rm -rf /tmp/$(APPLICATION)-test