Skip to content

Commit

Permalink
Updated kubernetes cluster version to 1.26 (#1985)
Browse files Browse the repository at this point in the history
* Updated kubernetes cluster version to 1.26

* Added git config command in build image

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
shahpratikr and mergify[bot] committed Apr 5, 2023
1 parent 52d0830 commit bf570c7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ IMAGE_NAME := $(BIN)

IMAGE := $(REGISTRY)/$(IMAGE_NAME)

BUILD_IMAGE ?= ghcr.io/kanisterio/build:v0.0.22
BUILD_IMAGE ?= ghcr.io/kanisterio/build:v0.0.23

# tag 0.1.0 is, 0.0.1 (latest) + gh + aws + helm binary
DOCS_BUILD_IMAGE ?= ghcr.io/kanisterio/docker-sphinx:0.2.0
Expand Down
6 changes: 3 additions & 3 deletions build/local_kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export MINIKUBE_WANTREPORTERRORPROMPT=false
export MINIKUBE_HOME=$HOME
export CHANGE_MINIKUBE_NONE_USER=true
export KUBECONFIG=$HOME/.kube/config
export KUBE_VERSION=${KUBE_VERSION:-"v1.21.1"}
export KIND_VERSION=${KIND_VERSION:-"v0.11.1"}
export KUBE_VERSION=${KUBE_VERSION:-"v1.26.0"}
export KIND_VERSION=${KIND_VERSION:-"v0.18.0"}
export LOCAL_CLUSTER_NAME=${LOCAL_CLUSTER_NAME:-"kanister"}
export LOCAL_PATH_PROV_VERSION="v0.0.11"
export SNAPSHOTTER_VERSION="v5.0.0"
export SNAPSHOTTER_VERSION="v6.2.1"
declare -a REQUIRED_BINS=( docker jq go )

if command -v apt-get
Expand Down
10 changes: 6 additions & 4 deletions docker/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,27 @@ FROM golang:1.19-bullseye
LABEL maintainer="Tom Manville<tom@kasten.io>"

RUN apt-get update && apt-get -y install apt-transport-https ca-certificates bash git gnupg2 software-properties-common curl jq wget \
&& update-ca-certificates
&& update-ca-certificates

RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
&& echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list

RUN apt update && apt install -y docker-ce docker-ce-cli containerd.io \
&& apt-get clean

COPY --from=bitnami/kubectl:1.17 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
COPY --from=bitnami/kubectl:1.26 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/

COPY --from=goreleaser/goreleaser:v1.12.3 /usr/bin/goreleaser /usr/local/bin/

COPY --from=alpine/helm:3.2.0 /usr/bin/helm /usr/local/bin/

COPY --from=golangci/golangci-lint:v1.50 /usr/bin/golangci-lint /usr/local/bin/

RUN wget -O /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-linux-amd64 \
RUN wget -O /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.18.0/kind-linux-amd64 \
&& chmod +x /usr/local/bin/kind

RUN git config --global --add safe.directory /go/src/github.com/kanisterio/kanister

# Adding CRD documentation generation tool.
RUN GOBIN=/usr/local/bin go install github.com/ahmetb/gen-crd-api-reference-docs@v0.3.0

Expand Down

0 comments on commit bf570c7

Please sign in to comment.