Skip to content

Commit

Permalink
Merge pull request #275 from kbst/versions
Browse files Browse the repository at this point in the history
Update versions
  • Loading branch information
pst authored Apr 30, 2022
2 parents b0bdb9a + 5b6f264 commit 797e6de
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 36 deletions.
6 changes: 0 additions & 6 deletions aws/_modules/eks/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ terraform {
version = ">= 3.26.0"
}

external = {
# https://registry.terraform.io/providers/hashicorp/external/latest
source = "hashicorp/external"
version = ">= 2.0.0"
}

kubernetes = {
# https://registry.terraform.io/providers/hashicorp/kubernetes/latest
source = "hashicorp/kubernetes"
Expand Down
14 changes: 1 addition & 13 deletions azurerm/_modules/aks/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,14 @@ terraform {
azurerm = {
# https://registry.terraform.io/providers/hashicorp/azurerm/latest
source = "hashicorp/azurerm"
version = ">= 2.45.1"
version = "< 3.0.0"
}

azuread = {
# https://registry.terraform.io/providers/hashicorp/azuread/latest
source = "hashicorp/azuread"
version = ">= 1.3.0"
}

external = {
# https://registry.terraform.io/providers/hashicorp/external/latest
source = "hashicorp/external"
version = ">= 2.0.0"
}

random = {
# https://registry.terraform.io/providers/hashicorp/random/latest
source = "hashicorp/random"
version = ">= 3.0.1"
}
}

required_version = ">= 0.13"
Expand Down
16 changes: 8 additions & 8 deletions oci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ RUN mkdir -p /opt/bin
# Common builder
FROM builder AS common-builder

# https://kubernetes.io/docs/setup/release/notes/
ARG KUBECTL_VERSION=v1.22.3
# https://github.com/kubernetes/kubernetes/releases
ARG KUBECTL_VERSION=v1.23.6

# https://github.com/kubernetes-sigs/kustomize/releases
ARG KUSTOMIZE_VERSION=v4.4.1
ARG KUSTOMIZE_VERSION=v4.5.4

# https://www.terraform.io/downloads.html
ARG TERRAFORM_VERSION=1.0.11
ARG TERRAFORM_VERSION=1.1.9

RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \
&& curl -Lo /opt/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
Expand Down Expand Up @@ -58,7 +58,7 @@ COPY oci/entrypoint oci/entrypoint_user /opt/bin/
FROM builder AS aws-builder

# https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst
ARG AWS_CLI_VERSION=2.3.6
ARG AWS_CLI_VERSION=2.6.0

RUN mkdir -p /opt/aws/bin

Expand All @@ -75,7 +75,7 @@ RUN echo "AWS_CLI_VERSION: ${AWS_CLI_VERSION}" \
FROM builder AS gcp-builder

# https://cloud.google.com/sdk/docs/release-notes
ARG GOOGLE_CLOUD_SDK_VERSION=364.0.0
ARG GOOGLE_CLOUD_SDK_VERSION=383.0.1

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 \
Expand All @@ -90,7 +90,7 @@ RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \
FROM builder AS azure-builder

# https://docs.microsoft.com/en-us/cli/azure/release-notes-azure-cli?tabs=azure-cli
ARG AZURE_CLI_VERSION=2.30.0
ARG AZURE_CLI_VERSION=2.36.0

RUN apt-get update && apt-get install -y \
libffi-dev
Expand All @@ -111,7 +111,7 @@ RUN echo "AZURE_CLI_VERSION: ${AZURE_CLI_VERSION}" \
FROM builder as kind-builder

# https://docs.docker.com/engine/release-notes/
ARG DOCKER_CLI_VERSION=20.10.10
ARG DOCKER_CLI_VERSION=20.10.14

RUN mkdir -p /opt/bin

Expand Down
2 changes: 1 addition & 1 deletion quickstart/src/configurations/aks/aks_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "aks_zero_nginx" {
kustomization = kustomization.aks_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
2 changes: 1 addition & 1 deletion quickstart/src/configurations/eks/eks_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "eks_zero_nginx" {
kustomization = kustomization.eks_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {}
Expand Down
2 changes: 1 addition & 1 deletion quickstart/src/configurations/gke/gke_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "gke_zero_nginx" {
kustomization = kustomization.gke_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "aks_zero_nginx" {
kustomization = kustomization.aks_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "eks_zero_nginx" {
kustomization = kustomization.eks_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "gke_zero_nginx" {
kustomization = kustomization.gke_zero
}
source = "kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
2 changes: 1 addition & 1 deletion tests/aks_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "aks_zero_nginx" {
kustomization = kustomization.aks_zero
}
source = "test.kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
2 changes: 1 addition & 1 deletion tests/eks_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "eks_zero_nginx" {
kustomization = kustomization.eks_zero
}
source = "test.kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down
2 changes: 1 addition & 1 deletion tests/gke_zero_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "gke_zero_nginx" {
kustomization = kustomization.gke_zero
}
source = "test.kbst.xyz/catalog/nginx/kustomization"
version = "0.46.0-kbst.1"
version = "1.1.3-kbst.1"

configuration = {
apps = {
Expand Down

0 comments on commit 797e6de

Please sign in to comment.