From fd81149703cb576d58bc99aedd2acbf0725b32ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 27 Jun 2020 16:26:27 +0200 Subject: [PATCH] Update Kubernetes 1.19.0-beta.0 to 1.19.0-beta.2 ```release-note - Update 1.19.0-beta.0 to 1.19.0-beta.2 ``` --- .azure-pipelines/publish-testing-images.yml | 6 +++--- .azure-pipelines/publish-tooling-images.yml | 6 +++--- .azure-pipelines/test.yml | 8 ++++---- RELEASE | 2 +- RELEASE_TEST | 2 +- internal/pkg/component/components/control_plane.go | 2 +- .../pkg/constants/zz_generated.release_data.constants.go | 2 +- internal/pkg/constants/zz_generated.test_data.go | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.azure-pipelines/publish-testing-images.yml b/.azure-pipelines/publish-testing-images.yml index 22ef3e18..7c6cfe1b 100644 --- a/.azure-pipelines/publish-testing-images.yml +++ b/.azure-pipelines/publish-testing-images.yml @@ -58,17 +58,17 @@ jobs: env: CONTAINER_BUILD_OPTIONS: --image hypervisor:1.18.5 DOCKER_HUB_TOKEN: $(DOCKER_HUB_TOKEN) -- job: publish_hypervisor_1_19_0_beta_0_container_image +- job: publish_hypervisor_1_19_0_beta_2_container_image dependsOn: - publish_containerd_1_3_4_container_image - displayName: Publish hypervisor:1.19.0-beta.0 container image + displayName: Publish hypervisor:1.19.0-beta.2 container image pool: vmImage: ubuntu-18.04 steps: - bash: make publish-container-image-ci displayName: Publish container image env: - CONTAINER_BUILD_OPTIONS: --image hypervisor:1.19.0-beta.0 + CONTAINER_BUILD_OPTIONS: --image hypervisor:1.19.0-beta.2 DOCKER_HUB_TOKEN: $(DOCKER_HUB_TOKEN) pr: branches: diff --git a/.azure-pipelines/publish-tooling-images.yml b/.azure-pipelines/publish-tooling-images.yml index eeda234b..1998795b 100644 --- a/.azure-pipelines/publish-tooling-images.yml +++ b/.azure-pipelines/publish-tooling-images.yml @@ -40,15 +40,15 @@ jobs: env: CONTAINER_BUILD_OPTIONS: --image kubelet-installer:1.18.5 DOCKER_HUB_TOKEN: $(DOCKER_HUB_TOKEN) -- job: publish_kubelet_installer_1_19_0_beta_0_container_image - displayName: Publish kubelet-installer:1.19.0-beta.0 container image +- job: publish_kubelet_installer_1_19_0_beta_2_container_image + displayName: Publish kubelet-installer:1.19.0-beta.2 container image pool: vmImage: ubuntu-18.04 steps: - bash: make publish-container-image-ci displayName: Publish container image env: - CONTAINER_BUILD_OPTIONS: --image kubelet-installer:1.19.0-beta.0 + CONTAINER_BUILD_OPTIONS: --image kubelet-installer:1.19.0-beta.2 DOCKER_HUB_TOKEN: $(DOCKER_HUB_TOKEN) pr: branches: diff --git a/.azure-pipelines/test.yml b/.azure-pipelines/test.yml index 9a9ef0e0..cf655108 100644 --- a/.azure-pipelines/test.yml +++ b/.azure-pipelines/test.yml @@ -83,18 +83,18 @@ jobs: displayName: Run end to end tests env: KUBERNETES_VERSION: 1.18.5 -- job: e2e_1_19_0_beta_0 - displayName: e2e tests - 1.19.0-beta.0 +- job: e2e_1_19_0_beta_2 + displayName: e2e tests - 1.19.0-beta.2 pool: vmImage: ubuntu-18.04 steps: - bash: make deps displayName: Install host dependencies env: - KUBERNETES_VERSION: 1.19.0-beta.0 + KUBERNETES_VERSION: 1.19.0-beta.2 - bash: make e2e-remote displayName: Run end to end tests env: - KUBERNETES_VERSION: 1.19.0-beta.0 + KUBERNETES_VERSION: 1.19.0-beta.2 variables: CI: "1" diff --git a/RELEASE b/RELEASE index ff7eeca8..cbec5a1f 100644 --- a/RELEASE +++ b/RELEASE @@ -13,6 +13,6 @@ kubernetesVersions: - version: "1.18.5" etcdVersion: "3.4.3" coreDNSVersion: "1.6.7" -- version: "1.19.0-beta.0" +- version: "1.19.0-beta.2" etcdVersion: "3.4.3" coreDNSVersion: "1.6.7" diff --git a/RELEASE_TEST b/RELEASE_TEST index c473f2d4..10d58277 100644 --- a/RELEASE_TEST +++ b/RELEASE_TEST @@ -21,6 +21,6 @@ kubernetesVersions: "1.18.5": containerdVersion: "1.3.4" pauseVersion: "3.1" - "1.19.0-beta.0": + "1.19.0-beta.2": containerdVersion: "1.3.4" pauseVersion: "3.1" diff --git a/internal/pkg/component/components/control_plane.go b/internal/pkg/component/components/control_plane.go index c40e394d..02cd3c5d 100644 --- a/internal/pkg/component/components/control_plane.go +++ b/internal/pkg/component/components/control_plane.go @@ -129,7 +129,7 @@ func (controlPlane *ControlPlane) Reconcile(inquirer inquirer.ReconcilerInquirer "--cluster-signing-key-file", componentSecretsPathFile(cluster.Namespace, cluster.Name, component.Name, "cluster-signing-ca.key"), "--cluster-cidr", cluster.ClusterCIDR, "--service-cluster-ip-range", cluster.ServiceCIDR, - "--allocate-node-cidrs", "true", + "--allocate-node-cidrs", } if cluster.NodeCIDRMaskSize > 0 { kubeControllerManagerArguments = append( diff --git a/internal/pkg/constants/zz_generated.release_data.constants.go b/internal/pkg/constants/zz_generated.release_data.constants.go index e67b57e0..b2b9367b 100644 --- a/internal/pkg/constants/zz_generated.release_data.constants.go +++ b/internal/pkg/constants/zz_generated.release_data.constants.go @@ -35,7 +35,7 @@ kubernetesVersions: - version: "1.18.5" etcdVersion: "3.4.3" coreDNSVersion: "1.6.7" -- version: "1.19.0-beta.0" +- version: "1.19.0-beta.2" etcdVersion: "3.4.3" coreDNSVersion: "1.6.7"` ) diff --git a/internal/pkg/constants/zz_generated.test_data.go b/internal/pkg/constants/zz_generated.test_data.go index 1ffa578b..f4827023 100644 --- a/internal/pkg/constants/zz_generated.test_data.go +++ b/internal/pkg/constants/zz_generated.test_data.go @@ -43,7 +43,7 @@ kubernetesVersions: "1.18.5": containerdVersion: "1.3.4" pauseVersion: "3.1" - "1.19.0-beta.0": + "1.19.0-beta.2": containerdVersion: "1.3.4" pauseVersion: "3.1"` )