From ef3471c32cacceb2e647b8db7af6ae08afecdb90 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Fri, 22 May 2020 16:53:23 +0200 Subject: [PATCH 1/6] Update versions in Dockerfile --- oci/Dockerfile | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/oci/Dockerfile b/oci/Dockerfile index 624925be..58e39fd3 100644 --- a/oci/Dockerfile +++ b/oci/Dockerfile @@ -23,10 +23,10 @@ RUN mkdir -p /opt/bin # Common builder FROM builder AS common-builder -ARG KUBECTL_VERSION=v1.18.1 -ARG KUSTOMIZE_VERSION=v3.5.4 -ARG TERRAFORM_VERSION=0.12.24 -ARG TERRAFORM_PROVIDER_KUSTOMIZE_VERSION=v0.1.0-beta.3 +ARG KUBECTL_VERSION=v1.18.3 +ARG KUSTOMIZE_VERSION=v3.5.5 +ARG TERRAFORM_VERSION=0.12.25 +ARG TERRAFORM_PROVIDER_KUSTOMIZE_VERSION=v0.1.1-beta.0 RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \ && curl -Lo /opt/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \ @@ -46,8 +46,9 @@ RUN echo "TERRAFORM_VERSION: ${TERRAFORM_VERSION}" \ && /opt/bin/terraform version RUN echo "TERRAFORM_PROVIDER_KUSTOMIZE_VERSION: ${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}" \ - && curl -LO https://github.com/kbst/terraform-provider-kustomize/releases/download/${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}/terraform-provider-kustomization-${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}-linux-amd64 \ - && mv terraform-provider-kustomization-${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}-linux-amd64 /opt/bin/terraform-provider-kustomization \ + && curl -LO https://github.com/kbst/terraform-provider-kustomize/releases/download/${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}/terraform-provider-kustomization-linux-amd64_${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}.tgz \ + && tar -xf terraform-provider-kustomization-linux-amd64_${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}.tgz \ + && mv terraform.d/plugins/linux_amd64/terraform-provider-kustomization /opt/bin/terraform-provider-kustomization \ && chmod +x /opt/bin/terraform-provider-kustomization COPY entrypoint entrypoint_user /opt/bin/ @@ -79,7 +80,7 @@ RUN echo "AWS_CLI_VERSION: N/A" \ # GCP builder FROM builder AS gcp-builder -ARG GOOGLE_CLOUD_SDK_VERSION=289.0.0 +ARG GOOGLE_CLOUD_SDK_VERSION=293.0.0 RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \ && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \ @@ -93,7 +94,7 @@ RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \ # Azure builder FROM builder AS azure-builder -ARG AZURE_CLI_VERSION=2.3.1 +ARG AZURE_CLI_VERSION=2.6.0 RUN apt-get update && apt-get install -y \ libffi-dev @@ -101,9 +102,9 @@ RUN apt-get update && apt-get install -y \ RUN echo "AZURE_CLI_VERSION: ${AZURE_CLI_VERSION}" \ && python -m venv /opt/azure/ \ && /opt/azure/bin/pip install --no-cache-dir \ - azure-cli==${AZURE_CLI_VERSION} \ + azure-cli==${AZURE_CLI_VERSION} \ && echo '#!/usr/bin/env bash\n/opt/azure/bin/python -m azure.cli "$@"' \ - > /opt/bin/az \ + > /opt/bin/az \ && chmod +x /opt/bin/az \ && /opt/bin/az --version @@ -127,9 +128,9 @@ RUN echo "DOCKER_CLI_VERSION: ${DOCKER_CLI_VERSION}" \ # install kind terraform provider from source RUN git clone https://github.com/kyma-incubator/terraform-provider-kind.git && \ - cd terraform-provider-kind && \ - git checkout ${TERRAFORM_PROVIDER_KIND_VERSION} && \ - go build -o /opt/bin/terraform-provider-kind + cd terraform-provider-kind && \ + git checkout ${TERRAFORM_PROVIDER_KIND_VERSION} && \ + go build -o /opt/bin/terraform-provider-kind # @@ -138,13 +139,13 @@ RUN git clone https://github.com/kyma-incubator/terraform-provider-kind.git && FROM ${BASE_IMAGE} AS final-base RUN apt-get update && apt-get install -y \ - ca-certificates \ - git \ - jq \ - wget \ - openssh-client \ - dnsutils \ - unzip \ + ca-certificates \ + git \ + jq \ + wget \ + openssh-client \ + dnsutils \ + unzip \ && rm -rf /var/lib/apt/lists/* ENV HOME=/infra/.user From a1162986644dc7dbd3842d6867a26b087ed08eb1 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Fri, 22 May 2020 17:01:07 +0200 Subject: [PATCH 2/6] AWS: Update Terraform providers --- aws/cluster/providers.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/cluster/providers.tf b/aws/cluster/providers.tf index 340e3f54..cc51e098 100644 --- a/aws/cluster/providers.tf +++ b/aws/cluster/providers.tf @@ -1,6 +1,6 @@ # https://github.com/terraform-providers/terraform-provider-aws/releases provider "aws" { - version = "~> 2.50.0" + version = "~> 2.63.0" } # https://github.com/terraform-providers/terraform-provider-external/releases @@ -10,7 +10,7 @@ provider "external" { # https://github.com/terraform-providers/terraform-provider-kubernetes/releases provider "kubernetes" { - version = "~> 1.10.0" + version = "~> 1.11.3" } # https://github.com/terraform-providers/terraform-provider-template/releases From 7028f9c9e0a9db7f8b123e937207234d9d5b7a88 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Fri, 22 May 2020 17:01:20 +0200 Subject: [PATCH 3/6] GCP: Update Terraform providers --- google/cluster/providers.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/cluster/providers.tf b/google/cluster/providers.tf index 002e2da3..49c1c149 100644 --- a/google/cluster/providers.tf +++ b/google/cluster/providers.tf @@ -5,12 +5,12 @@ provider "external" { # https://github.com/terraform-providers/terraform-provider-google/releases provider "google" { - version = "~> 3.9.0" + version = "~> 3.22.0" } # https://github.com/terraform-providers/terraform-provider-kubernetes/releases provider "kubernetes" { - version = "~> 1.10.0" + version = "~> 1.11.3" } # https://github.com/terraform-providers/terraform-provider-template/releases From dd5bfd9fefff37bafd50ffcd6ff3bf77078427e3 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Fri, 22 May 2020 17:01:33 +0200 Subject: [PATCH 4/6] Azure: Update Terraform providers --- azurerm/cluster/providers.tf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/azurerm/cluster/providers.tf b/azurerm/cluster/providers.tf index 47243256..44890f69 100644 --- a/azurerm/cluster/providers.tf +++ b/azurerm/cluster/providers.tf @@ -5,17 +5,19 @@ provider "external" { # https://github.com/terraform-providers/terraform-provider-azurerm/releases provider "azurerm" { - version = "~> 1.44.0" + version = "~> 2.11.0" + + features {} } # https://github.com/terraform-providers/terraform-provider-azuread/releases provider "azuread" { - version = "~> 0.7.0" + version = "~> 0.9.0" } # https://github.com/terraform-providers/terraform-provider-kubernetes/releases provider "kubernetes" { - version = "~> 1.10.0" + version = "~> 1.11.3" } # https://github.com/terraform-providers/terraform-provider-random/releases From 2ab95b7fc2082bb4f75e05343d5fae69f089066c Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Fri, 22 May 2020 18:29:45 +0200 Subject: [PATCH 5/6] GKE: Bump min_master_version to 1.16.x --- quickstart/src/configurations/gke/config.auto.tfvars | 2 +- tests/config.auto.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/src/configurations/gke/config.auto.tfvars b/quickstart/src/configurations/gke/config.auto.tfvars index 68aee364..c4f3bb85 100644 --- a/quickstart/src/configurations/gke/config.auto.tfvars +++ b/quickstart/src/configurations/gke/config.auto.tfvars @@ -18,7 +18,7 @@ clusters = { base_domain = "" # Initial desired K8s version, will be upgraded automatically - cluster_min_master_version = "1.15" + cluster_min_master_version = "1.16" # Initial number of desired nodes per zone cluster_initial_node_count = 1 diff --git a/tests/config.auto.tfvars b/tests/config.auto.tfvars index 93dfdc8e..ea5e0f90 100644 --- a/tests/config.auto.tfvars +++ b/tests/config.auto.tfvars @@ -24,7 +24,7 @@ clusters = { project_id = "terraform-kubestack-testing" name_prefix = "kbstacctest" base_domain = "infra.serverwolken.de" - cluster_min_master_version = "1.15" + cluster_min_master_version = "1.16" cluster_min_node_count = 1 cluster_max_node_count = 1 region = "europe-west1" From c279300e3d98e0310eabf9a7408f076b664f7a7e Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Sat, 23 May 2020 09:01:49 +0200 Subject: [PATCH 6/6] Delay updating Kustomize and Kustomize provider Upstream regression incorrectly sets boolean values for labels. Related issues: * https://github.com/kbst/terraform-provider-kustomize/issues/23 * https://github.com/kubernetes-sigs/kustomize/issues/2479 --- oci/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/oci/Dockerfile b/oci/Dockerfile index 58e39fd3..baf247d7 100644 --- a/oci/Dockerfile +++ b/oci/Dockerfile @@ -24,9 +24,9 @@ RUN mkdir -p /opt/bin FROM builder AS common-builder ARG KUBECTL_VERSION=v1.18.3 -ARG KUSTOMIZE_VERSION=v3.5.5 +ARG KUSTOMIZE_VERSION=v3.5.4 ARG TERRAFORM_VERSION=0.12.25 -ARG TERRAFORM_PROVIDER_KUSTOMIZE_VERSION=v0.1.1-beta.0 +ARG TERRAFORM_PROVIDER_KUSTOMIZE_VERSION=v0.1.0-beta.3 RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \ && curl -Lo /opt/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \ @@ -46,9 +46,8 @@ RUN echo "TERRAFORM_VERSION: ${TERRAFORM_VERSION}" \ && /opt/bin/terraform version RUN echo "TERRAFORM_PROVIDER_KUSTOMIZE_VERSION: ${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}" \ - && curl -LO https://github.com/kbst/terraform-provider-kustomize/releases/download/${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}/terraform-provider-kustomization-linux-amd64_${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}.tgz \ - && tar -xf terraform-provider-kustomization-linux-amd64_${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}.tgz \ - && mv terraform.d/plugins/linux_amd64/terraform-provider-kustomization /opt/bin/terraform-provider-kustomization \ + && curl -LO https://github.com/kbst/terraform-provider-kustomize/releases/download/${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}/terraform-provider-kustomization-${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}-linux-amd64 \ + && mv terraform-provider-kustomization-${TERRAFORM_PROVIDER_KUSTOMIZE_VERSION}-linux-amd64 /opt/bin/terraform-provider-kustomization \ && chmod +x /opt/bin/terraform-provider-kustomization COPY entrypoint entrypoint_user /opt/bin/