Merge pull request #595 from gardener/update

Update
gardener · Aug 31, 2021 · 80420fa · 80420fa
2 parents 276ce4f + f39db53
commit 80420fa
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 17 deletions.
diff --git a/.ci/component_descriptor b/.ci/component_descriptor
@@ -32,6 +32,8 @@ ${ADD_DEPENDENCIES_CMD} \
     --component-dependencies \
     '{"name": "github.com/gardener/gardener-extension-provider-vsphere", "version": "'$(jq -r ".versions.gardener.extensions[\"provider-vsphere\"].version" <<< $DEP_VERSIONS)'"}' \
     --component-dependencies \
+    '{"name": "github.com/gardener/gardener-extension-runtime-gvisor", "version": "'$(jq -r ".versions.gardener.extensions[\"runtime-gvisor\"].version" <<< $DEP_VERSIONS)'"}' \
+    --component-dependencies \
     '{"name": "github.com/gardener/dashboard", "version": "'$(jq -r ".versions.dashboard.core.version" <<< $DEP_VERSIONS)'"}' \
     --component-dependencies \
     '{"name": "github.com/gardener/terminal-controller-manager", "version": "'$(jq -r ".versions.dashboard.terminals[\"terminal-controller-manager\"].version" <<< $DEP_VERSIONS)'"}' \

diff --git a/.ci/set_dependency_version b/.ci/set_dependency_version
@@ -48,6 +48,8 @@ elif dep_name == 'github.com/gardener/gardener-extension-shoot-dns-service':
     set_dep_version(dep_version, 'versions', 'gardener', 'extensions', 'shoot-dns-service', 'version')
 elif dep_name == 'github.com/gardener/gardener-extension-provider-vsphere':
     set_dep_version(dep_version, 'versions', 'gardener', 'extensions', 'provider-vsphere', 'version')
+elif dep_name == 'github.com/gardener/gardener-extension-runtime-gvisor':
+    set_dep_version(dep_version, 'versions', 'gardener', 'extensions', 'runtime-gvisor', 'version')
 elif dep_name == 'github.com/gardener/dashboard':
     set_dep_version(dep_version, 'versions', 'dashboard', 'core', 'version')
 elif dep_name == 'github.com/gardener/terminal-controller-manager':

diff --git a/acre.yaml b/acre.yaml
@@ -144,6 +144,13 @@ landscape:
           chart_path: charts/gardener-extension-provider-vsphere
           image_tag: (( valid( provider-vsphere.tag ) ? provider-vsphere.tag :~~ ))
           image_repo: (( ~~ ))
+        runtime-gvisor:
+          <<: (( merge ))
+          tag: (( valid( runtime-gvisor.branch ) -or valid( runtime-gvisor.commit ) ? ~~ :.dependency_versions.versions.gardener.extensions.runtime-gvisor.version ))
+          repo: (( .dependency_versions.versions.gardener.extensions.runtime-gvisor.repo ))
+          chart_path: charts/gardener-extension-runtime-gvisor
+          image_tag: (( valid( runtime-gvisor.tag ) ? runtime-gvisor.tag :~~ ))
+          image_repo: (( ~~ ))
     dashboard:
       <<: (( merge ))
       repo: (( .dependency_versions.versions.dashboard.core.repo ))

diff --git a/components/dashboard/deployment.yaml b/components/dashboard/deployment.yaml
@@ -58,7 +58,6 @@ dashboard:
     oidc:
       issuerUrl: (( imports.identity.export.issuer_url ))
       ca: (( imports.cert-controller.export.ca.crt || ~~ ))
-      redirectUri: (( imports.identity.export.callback_url ))
       clientSecret: (( imports.identity.export.dashboardClientSecret ))
       public:
         clientId: kube-kubectl

diff --git a/components/gardencontent/profiles/manifests/manifest.yaml b/components/gardencontent/profiles/manifests/manifest.yaml
@@ -34,13 +34,30 @@ defaults:
       - name: gardenlinux
         versions:
         - version: 318.8.0
+          cri:
+          - name: docker
+          - containerRuntimes:
+            - type: gvisor
+            name: containerd
         - version: 184.0.0
+          cri:
+          - name: docker
+          - containerRuntimes:
+            - type: gvisor
+            name: containerd
       - name: ubuntu
         versions:
         - version: 18.4.20200228
+          cri:
+          - name: docker
+          - containerRuntimes:
+            - type: gvisor
+            name: containerd
       - name: suse-chost
         versions:
         - version: 15.2.20210610
+          cri:
+          - name: docker
     machineTypes:
       - <<: (( defaults.providerspec.machineTypes || ~ ))
     volumeTypes:
@@ -50,16 +67,16 @@ defaults:
     caBundle: (( values.config.caBundle || ~~ ))
   kubernetes:
     versions:
-      - classification: preview
+      - classification: supported
         version: 1.21.3
       - classification: supported
-        version: 1.20.8
+        version: 1.20.9
       - classification: deprecated
-        version: 1.20.6
+        version: 1.20.8
       - classification: supported
-        version: 1.19.12
+        version: 1.19.13
       - classification: deprecated
-        version: 1.19.10
+        version: 1.19.12
       - classification: supported
         version: 1.18.20
       - classification: deprecated

diff --git a/components/gardencontent/profiles/provider/gcp/iaas.yaml b/components/gardencontent/profiles/provider/gcp/iaas.yaml
@@ -14,10 +14,7 @@
 
 <<: (( &template ))
 
-machineImages:
-  - name: gardenlinux
-    versions:
-    - version: 27.1.0
+machineImages: {}
 
 providerConfig:
   apiVersion: gcp.provider.extensions.gardener.cloud/v1alpha1

diff --git a/components/gardener/extensions/component.yaml b/components/gardener/extensions/component.yaml
@@ -37,6 +37,7 @@ default_extensions:
   - os-gardenlinux
   - dns-external
   - networking-calico
+  - runtime-gvisor
   - <<: (( sum[.infrastructures|[]|s,e|-> s [ "provider-" e ]] ))
   - (( ( .landscape.dashboard.terminals.active || false ) ? "shoot-cert-service" :~~ ))
 activated_extensions: (( valid( landscape.gardener.extensions ) ? keys(select{landscape.gardener.extensions|e|-> valid( e.active ) -and ( e.active == true )}) :[] ))

diff --git a/components/gardener/extensions/deployment.yaml b/components/gardener/extensions/deployment.yaml
@@ -64,6 +64,7 @@ manifest_templates:
       deployment:
         deploymentRefs:
         - name: (( data.extensionName ))
+        policy: OnDemand
       resources: (( data.resources ))
 
 
@@ -431,3 +432,29 @@ extension_specs:
       type: shoot-dns-service
       globallyEnabled: true
       primary: true
+
+########################################
+  runtime-gvisor:
+########################################
+    <<: (( &template ))
+    extensionName: runtime-gvisor
+    type: helm
+    providerConfig:
+      chart: (( encoded_chart ))
+      values:
+        <<: (( valuesOverwrite ))
+        concurrentSyncs: 25
+        image:
+          repository: (( version.image_repo || ~~ ))
+          tag: (( version.image_tag || ~~ ))
+        resources:
+          limits:
+            cpu: 300m
+            memory: 700Mi
+          requests:
+            cpu: 30m
+            memory: 256Mi
+    resources:
+    - kind: ContainerRuntime
+      type: gvisor
+      primary: true
diff --git a/dependency-versions.yaml b/dependency-versions.yaml
@@ -3,7 +3,7 @@
     "gardener": {
       "core": {
         "repo": "https://github.com/gardener/gardener.git",
-        "version": "v1.28.0"
+        "version": "v1.29.0"
       },
       "extensions": {
         "dns-external": {
@@ -16,35 +16,35 @@
         },
         "os-suse-chost": {
           "repo": "https://github.com/gardener/gardener-extension-os-suse-chost.git",
-          "version": "v1.12.0"
+          "version": "v1.13.0"
         },
         "os-ubuntu": {
           "repo": "https://github.com/gardener/gardener-extension-os-ubuntu.git",
           "version": "v1.13.0"
         },
         "os-gardenlinux": {
           "repo": "https://github.com/gardener/gardener-extension-os-gardenlinux.git",
-          "version": "v0.9.0"
+          "version": "v0.10.0"
         },
         "provider-aws": {
           "repo": "https://github.com/gardener/gardener-extension-provider-aws.git",
           "version": "v1.27.0"
         },
         "provider-azure": {
           "repo": "https://github.com/gardener/gardener-extension-provider-azure.git",
-          "version": "v1.21.0"
+          "version": "v1.21.2"
         },
         "provider-gcp": {
           "repo": "https://github.com/gardener/gardener-extension-provider-gcp.git",
-          "version": "v1.17.0"
+          "version": "v1.18.0"
         },
         "provider-openstack": {
           "repo": "https://github.com/gardener/gardener-extension-provider-openstack.git",
           "version": "v1.20.0"
         },
         "shoot-cert-service": {
           "repo": "https://github.com/gardener/gardener-extension-shoot-cert-service.git",
-          "version": "v1.17.0"
+          "version": "v1.17.1"
         },
         "shoot-dns-service": {
           "repo": "https://github.com/gardener/gardener-extension-shoot-dns-service.git",
@@ -53,13 +53,17 @@
         "provider-vsphere": {
           "repo": "https://github.com/gardener/gardener-extension-provider-vsphere.git",
           "version": "v0.10.0"
+        },
+        "runtime-gvisor": {
+          "repo": "https://github.com/gardener/gardener-extension-runtime-gvisor.git",
+          "version": "v0.2.0"
         }
       }
     },
     "dashboard": {
       "core": {
         "repo": "https://github.com/gardener/dashboard.git",
-        "version": "1.50.2"
+        "version": "1.51.2"
       },
       "identity": {
         "repo": "(( dashboard.core.repo ))",