Merge pull request #27 from ialidzhikov/fix/handle-sigterm

Adapt terraformer Pod spec to the latest image
gardener · Apr 3, 2020 · 31fe706 · 31fe706
2 parents 00e6d6b + 071ecf0
commit 31fe706
Show file tree

Hide file tree

Showing 40 changed files with 497 additions and 131 deletions.
diff --git a/charts/images.yaml b/charts/images.yaml
@@ -2,7 +2,7 @@ images:
 - name: terraformer
   sourceRepository: github.com/gardener/terraformer
   repository: eu.gcr.io/gardener-project/gardener/terraformer
-  tag: "0.20.0"
+  tag: "v1.0.0"
 - name: cloud-controller-manager
   sourceRepository: https://github.com/packethost/packet-ccm
   repository: docker.io/packethost/packet-ccm

diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
 	github.com/gardener/etcd-druid v0.1.3
-	github.com/gardener/gardener v1.1.1-0.20200323102039-58593d8be86a
-	github.com/gardener/gardener-extensions v1.5.0
+	github.com/gardener/gardener v1.1.1-0.20200330051317-a326f96cf32b
+	github.com/gardener/gardener-extensions v1.5.1-0.20200402091828-df061f8dae06
 	github.com/gardener/machine-controller-manager v0.26.0
 	github.com/go-logr/logr v0.1.0
 	github.com/gobuffalo/packr/v2 v2.1.0

diff --git a/go.sum b/go.sum
@@ -118,12 +118,10 @@ github.com/gardener/etcd-druid v0.1.3 h1:uiPKUHubieRziHR7lr7I0WzIglf2aNVWf94Gm5N
 github.com/gardener/etcd-druid v0.1.3/go.mod h1:/A8kSp7DSo7oOhsOhD9Se/xF6BOD9TQJMawf6k7AOsU=
 github.com/gardener/external-dns-management v0.7.3 h1:SAW9ur2mjZ+x89xbmcplJgqNUmFGYIZLI2E+PaBhhG0=
 github.com/gardener/external-dns-management v0.7.3/go.mod h1:Y3om11E865x4aQ7cmcHjknb8RMgCO153huRb/SvP+9o=
-github.com/gardener/gardener v1.1.1-0.20200311075931-7f7e52b986e7 h1:UD25lsw3fYBK7pUlXkGwUXmlpnksG9JbdwC75XZTBOQ=
-github.com/gardener/gardener v1.1.1-0.20200311075931-7f7e52b986e7/go.mod h1:lGAx5NkFDWoC4hPIL+lHJamafBxmOt5MrHq9hGtp5VI=
-github.com/gardener/gardener v1.1.1-0.20200323102039-58593d8be86a h1:TkMIvx1xRmd3xLuORXEqsQhpni49+wfuT4keC6d3Tsc=
-github.com/gardener/gardener v1.1.1-0.20200323102039-58593d8be86a/go.mod h1:lGAx5NkFDWoC4hPIL+lHJamafBxmOt5MrHq9hGtp5VI=
-github.com/gardener/gardener-extensions v1.5.0 h1:6JkU0/DV2bJvwkuPoP7/nPlyCrzPGKfw5j4f+wtXBeI=
-github.com/gardener/gardener-extensions v1.5.0/go.mod h1:yCdFgMAz++ex3d1fmhN3Yti9MR9HN9iKTUjz5eI0uIQ=
+github.com/gardener/gardener v1.1.1-0.20200330051317-a326f96cf32b h1:MkEDp9PdrZPkIAPGj6oNcKl0fBaOcJ1ddKsAA7bVWnI=
+github.com/gardener/gardener v1.1.1-0.20200330051317-a326f96cf32b/go.mod h1:lGAx5NkFDWoC4hPIL+lHJamafBxmOt5MrHq9hGtp5VI=
+github.com/gardener/gardener-extensions v1.5.1-0.20200402091828-df061f8dae06 h1:ZMAxjMWvydRD1ndHAFfa/ItQp4JEy9OPsVmNc1gc0og=
+github.com/gardener/gardener-extensions v1.5.1-0.20200402091828-df061f8dae06/go.mod h1:+0MkNqbRaTvPMfEe/MoS31L5FM8W32WYvhpH4Y53Y5s=
 github.com/gardener/gardener-resource-manager v0.10.0 h1:6OUKoWI3oha42F0oJN8OEo3UR+D3onOCel4Th+zgotU=
 github.com/gardener/gardener-resource-manager v0.10.0/go.mod h1:0pKTHOhvU91eQB0EYr/6Ymd7lXc/5Hi8P8tF/gpV0VQ=
 github.com/gardener/hvpa-controller v0.0.0-20191014062307-fad3bdf06a25 h1:nOFITmV7vt4fcYPEXgj66Qs83FdDEMvL/LQcR0diRRE=

diff --git a/pkg/controller/worker/machines_test.go b/pkg/controller/worker/machines_test.go
@@ -98,14 +98,14 @@ var _ = Describe("Machines", func() {
 				userData    = []byte("some-user-data")
 
 				namePool1           string
-				minPool1            int
-				maxPool1            int
+				minPool1            int32
+				maxPool1            int32
 				maxSurgePool1       intstr.IntOrString
 				maxUnavailablePool1 intstr.IntOrString
 
 				namePool2           string
-				minPool2            int
-				maxPool2            int
+				minPool2            int32
+				maxPool2            int32
 				maxSurgePool2       intstr.IntOrString
 				maxUnavailablePool2 intstr.IntOrString
 

diff --git a/vendor/github.com/gardener/gardener-extensions/pkg/controller/cluster.go b/vendor/github.com/gardener/gardener-extensions/pkg/controller/cluster.go
diff --git a/...github.com/gardener/gardener-extensions/pkg/controller/healthcheck/healtcheck_actuator.go b/...github.com/gardener/gardener-extensions/pkg/controller/healthcheck/healtcheck_actuator.go
diff --git a/vendor/github.com/gardener/gardener-extensions/pkg/controller/status.go b/vendor/github.com/gardener/gardener-extensions/pkg/controller/status.go
diff --git a/...com/gardener/gardener-extensions/pkg/controller/worker/genericactuator/actuator_delete.go b/...com/gardener/gardener-extensions/pkg/controller/worker/genericactuator/actuator_delete.go
diff --git a/.../gardener/gardener-extensions/pkg/controller/worker/genericactuator/actuator_reconcile.go b/.../gardener/gardener-extensions/pkg/controller/worker/genericactuator/actuator_reconcile.go
diff --git a/vendor/github.com/gardener/gardener-extensions/pkg/controller/worker/machines.go b/vendor/github.com/gardener/gardener-extensions/pkg/controller/worker/machines.go
diff --git a/vendor/github.com/gardener/gardener-extensions/pkg/terraformer/terraformer.go b/vendor/github.com/gardener/gardener-extensions/pkg/terraformer/terraformer.go
diff --git a/vendor/github.com/gardener/gardener/pkg/api/extensions/accessor.go b/vendor/github.com/gardener/gardener/pkg/api/extensions/accessor.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/types_common.go b/vendor/github.com/gardener/gardener/pkg/apis/core/types_common.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/types_quota.go b/vendor/github.com/gardener/gardener/pkg/apis/core/types_quota.go