Skip to content

Commit

Permalink
Merge branch 'main' into agones-guru
Browse files Browse the repository at this point in the history
  • Loading branch information
kursataktas authored Nov 18, 2024
2 parents 80e09d9 + 10a8bca commit 562f630
Show file tree
Hide file tree
Showing 59 changed files with 17,392 additions and 16,667 deletions.
1 change: 1 addition & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ rules:
ignore:
- /build/.gomod/
- /build/.config/
- /build/scripts/example-version-checker/tmp
- /install/
- /sdks/
- /test/sdk/
Expand Down
9 changes: 2 additions & 7 deletions build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ RUN go install golang.org/x/tools/cmd/goimports@latest && \
go install golang.org/x/pkgsite/cmd/pkgsite@latest

# the kubernetes version for the file
#
# When this is raised to 1.29: bump the code-generator version on line 66 to the v0.30 tag.
# When this is raised to >=1.30: delete line 66-67 and uncomment line 68 to stop pinning code-generator.
ENV KUBERNETES_VER 1.29.7
ENV KUBERNETES_VER 1.30.4

# overwrite kubectl as we want a specific version
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VER}/bin/linux/amd64/kubectl && \
Expand All @@ -63,9 +60,7 @@ RUN echo "source <(kubectl completion bash)" >> /root/.bashrc

# install the release branch of the code generator tools
RUN mkdir -p /go/src/k8s.io && cd /go/src/k8s.io && \
git clone -b v0.30.0 --depth=3 /~https://github.com/kubernetes/code-generator.git
# We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
# git clone -b kubernetes-${KUBERNETES_VER} --depth=3 /~https://github.com/kubernetes/code-generator.git
git clone -b kubernetes-${KUBERNETES_VER} --depth=3 /~https://github.com/kubernetes/code-generator.git

# install Helm package manager
ENV HELM_VER 3.10.3
Expand Down
2 changes: 1 addition & 1 deletion build/e2e-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
ENV PATH /usr/local/go/bin:/go/bin:$PATH

# install kubectl without gcloud as we want the last version
ENV KUBECTL_VER 1.29.7
ENV KUBECTL_VER 1.30.4
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/linux/amd64/kubectl && \
chmod go+rx ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl
Expand Down
Loading

0 comments on commit 562f630

Please sign in to comment.