Merge pull request #267 from gardener/update

Update extensions and other components
gardener · Jul 31, 2020 · 0d222c4 · 0d222c4
2 parents de2b6d7 + b07d9ff
commit 0d222c4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/acre.yaml b/acre.yaml
@@ -180,11 +180,11 @@ landscape:
         image_tag: v0.0.1
       grafana:
         image_repo: grafana/grafana
-        image_tag: "6.3.2"
+        image_tag: "7.0.3"
       gardener-metrics-exporter:
         <<: (( merge ))
         repo: https://github.com/gardener/gardener-metrics-exporter.git
-        tag: (( valid( branch ) -or valid( commit ) ? ~~ :"0.10.0" ))
+        tag: (( valid( branch ) -or valid( commit ) ? ~~ :"0.11.0" ))
         image_tag: (( valid( tag ) ? tag :~~ ))
         image_repo: (( ~~ ))
   iaas: (( merge none // map[ select[stub()|e|-> ( ! defined( e.mode ) ) -or ( e.mode != "inactive" ) ] |idx,v|-> v { "mode" = v.mode || "seed" } ] ))

diff --git a/components/cert-manager/controller/action b/components/cert-manager/controller/action
@@ -29,14 +29,23 @@ webhookready()
       return
     fi
 
-    debug "webhook replicas: $(kubectl -n "$namespace" get deployment cert-manager-webhook -o jsonpath='{.status.readyReplicas}')"
-    while true; do
-      replicas=$(kubectl -n "$namespace" get deployment cert-manager-webhook -o jsonpath='{.status.readyReplicas}')
-      if [[ ${replicas:-0} -gt 0 ]]; then
-        break
-      fi
-      echo "waiting for cert-manager webhook to be running"
-      sleep 10
-    done
+    local starttime
+    local endtime
+    local timeout=600
+    starttime=$(date +%s)
+    endtime=$(( starttime + timeout ))
+
+    if [[ -z "$DRYRUN" ]]; then
+      debug "webhook replicas: $(kubectl -n "$namespace" get deployment cert-manager-webhook -o jsonpath='{.status.readyReplicas}')"
+      while [[ $(date +%s) -le $endtime ]]; do
+        replicas=$(kubectl -n "$namespace" get deployment cert-manager-webhook -o jsonpath='{.status.readyReplicas}')
+        if [[ ${replicas:-0} -gt 0 ]]; then
+          return
+        fi
+        echo "waiting for cert-manager webhook to be running"
+        sleep 10
+      done
+      fail "cert-manager-webhook did not become ready within $timeout seconds"
+    fi
   fi
 }
diff --git a/components/gardencontent/profiles/manifests/manifest.yaml b/components/gardencontent/profiles/manifests/manifest.yaml
@@ -49,8 +49,8 @@ defaults:
     caBundle: (( values.config.caBundle || ~~ ))
   kubernetes:
     versions:
-      - version: 1.18.4
-      - version: 1.17.7
-      - version: 1.16.10
+      - version: 1.18.5
+      - version: 1.17.8
+      - version: 1.16.12
       - version: 1.15.12
   providerspec: (( *values.providerspec ))
diff --git a/dependency-versions.yaml b/dependency-versions.yaml
@@ -12,19 +12,19 @@
         },
         "networking-calico": {
           "repo": "https://github.com/gardener/gardener-extension-networking-calico.git",
-          "version": "v1.8.0"
+          "version": "v1.8.1"
         },
         "os-coreos": {
           "repo": "https://github.com/gardener/gardener-extension-os-coreos.git",
-          "version": "v1.4.0"
+          "version": "v1.5.0"
         },
         "os-suse-chost": {
           "repo": "https://github.com/gardener/gardener-extension-os-suse-jeos.git",
           "version": "v1.8.0"
         },
         "os-ubuntu": {
           "repo": "https://github.com/gardener/gardener-extension-os-ubuntu.git",
-          "version": "v1.5.0"
+          "version": "v1.6.0"
         },
         "os-gardenlinux": {
           "repo": "https://github.com/gardener/gardener-extension-os-gardenlinux.git",
@@ -40,7 +40,7 @@
         },
         "provider-gcp": {
           "repo": "https://github.com/gardener/gardener-extension-provider-gcp.git",
-          "version": "v1.7.2"
+          "version": "v1.8.2"
         },
         "provider-openstack": {
           "repo": "https://github.com/gardener/gardener-extension-provider-openstack.git",
@@ -55,7 +55,7 @@
     "dashboard": {
       "core": {
         "repo": "https://github.com/gardener/dashboard.git",
-        "version": "1.43.1"
+        "version": "1.43.3"
       },
       "identity": {
         "repo": "(( dashboard.core.repo ))",