Merge pull request #111 from kbst/updateversions

Updateversions
kbst · May 23, 2020 · e6b68bc · e6b68bc
2 parents b004875 + c279300
commit e6b68bc
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git 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

diff --git 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

diff --git 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

diff --git a/oci/Dockerfile b/oci/Dockerfile
@@ -23,9 +23,9 @@ RUN mkdir -p /opt/bin
 # Common builder
 FROM builder AS common-builder
 
-ARG KUBECTL_VERSION=v1.18.1
+ARG KUBECTL_VERSION=v1.18.3
 ARG KUSTOMIZE_VERSION=v3.5.4
-ARG TERRAFORM_VERSION=0.12.24
+ARG TERRAFORM_VERSION=0.12.25
 ARG TERRAFORM_PROVIDER_KUSTOMIZE_VERSION=v0.1.0-beta.3
 
 RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \
@@ -79,7 +79,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,17 +93,17 @@ 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
 
 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 +127,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 +138,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

diff --git 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
@@ -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"