Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Update dependencies #2096

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye
FROM mcr.microsoft.com/devcontainers/go:1.23-bookworm

ARG TARGETOS
ARG TARGETARCH

RUN curl -L -o devspace "https://github.com/loft-sh/devspace/releases/latest/download/devspace-linux-${TARGETARCH}" && install -c -m 0755 devspace /usr/local/bin
RUN curl -L -o vcluster "https://github.com/loft-sh/vcluster/releases/latest/download/vcluster-linux-${TARGETARCH}" && install -c -m 0755 vcluster /usr/local/bin
RUN curl -L -o kind "https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-${TARGETARCH}" && install -c -m 0755 kind /usr/local/bin
RUN curl -L -o kind "https://kind.sigs.k8s.io/dl/v0.24.0/kind-linux-${TARGETARCH}" && install -c -m 0755 kind /usr/local/bin
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/${TARGETARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
RUN bash -c "curl -s https://get.helm.sh/helm-v3.11.1-linux-${TARGETARCH}.tar.gz > helm3.tar.gz" && tar -zxvf helm3.tar.gz linux-${TARGETARCH}/helm && chmod +x linux-${TARGETARCH}/helm && mv linux-${TARGETARCH}/helm /usr/local/bin && rm helm3.tar.gz && rm -R linux-${TARGETARCH}
RUN bash -c "curl -s https://get.helm.sh/helm-v3.15.4-linux-${TARGETARCH}.tar.gz > helm3.tar.gz" && tar -zxvf helm3.tar.gz linux-${TARGETARCH}/helm && chmod +x linux-${TARGETARCH}/helm && mv linux-${TARGETARCH}/helm /usr/local/bin && rm helm3.tar.gz && rm -R linux-${TARGETARCH}
16 changes: 14 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,23 @@ updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
interval: weekly
target-branch: main

- package-ecosystem: docker
directory: /
schedule:
interval: monthly
interval: weekly
target-branch: main

- package-ecosystem: docker
directory: /.devcontainer
schedule:
interval: weekly
target-branch: main

- package-ecosystem: npm
directory: /docs
schedule:
interval: weekly
target-branch: main
2 changes: 1 addition & 1 deletion .github/workflows/compatibility.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_ACCESS_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
OUT_DIR: build/
TARGET_OUT_DIR: build/docs/v0.19
TARGET_OUT_DIR: build/docs/v0.20

jobs:
run:
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "18"
- name: Build Docs
run: |
yarn
Expand All @@ -49,7 +49,7 @@ jobs:
mkdir -p $TARGET_OUT_DIR
mv tmp-$TARGET_OUT_DIR/* $TARGET_OUT_DIR

npm install -g netlify-cli@3.20.1
npm install -g netlify-cli@17.35.0
fi
working-directory: ./docs
- name: Deploy Preview Site
Expand Down
37 changes: 18 additions & 19 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ jobs:
name: e2e-binaries
path: ./test/*/*.test
retention-days: 7

vcluster-install-delete:
name: Install and delete virtual cluster
needs:
- build-and-push-syncer-image
- build-vcluster-cli

runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -154,13 +154,13 @@ jobs:
- uses: azure/setup-helm@v4
name: Setup Helm
with:
version: "v3.11.0"
version: "v3.15.4"

- name: Set up kind k8s cluster
uses: engineerd/setup-kind@v0.5.0
with:
version: "v0.20.0"
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
version: "v0.24.0"
image: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114

- name: Testing kind cluster set-up
run: |
Expand All @@ -179,26 +179,26 @@ jobs:
uses: actions/download-artifact@v4
with:
name: vcluster_syncer

- name: Setup environment
run: |

kind load image-archive vcluster_syncer

chmod +x vcluster && sudo mv vcluster /usr/bin

sudo apt-get install -y sed

- name: Run tests - install and delete virtual cluster using kubectl
run: |
set -x

./hack/vcluster-install-scripts/test-kubectl-install.sh

- name: Run tests - install and delete virtual cluster using helm
run: |
set -x

./hack/vcluster-install-scripts/test-helm-install.sh

download-latest-cli:
Expand All @@ -214,7 +214,7 @@ jobs:
name: vcluster-current
path: ./vcluster-current
retention-days: 7

upgrade-test:
name: test if we can upgrade from older version
needs:
Expand All @@ -233,12 +233,12 @@ jobs:
- uses: azure/setup-helm@v4
name: Setup Helm
with:
version: "v3.11.0"
version: "v3.15.4"
- name: Set up kind k8s cluster
uses: engineerd/setup-kind@v0.5.0
with:
version: "v0.20.0"
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
version: "v0.24.0"
image: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114

- name: Testing kind cluster set-up
run: |
Expand Down Expand Up @@ -350,13 +350,13 @@ jobs:
- uses: azure/setup-helm@v4
name: Setup Helm
with:
version: "v3.11.0"
version: "v3.15.4"

- name: Set up kind k8s cluster
uses: engineerd/setup-kind@v0.5.0
with:
version: "v0.20.0"
image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
version: "v0.24.0"
image: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114

- name: Testing kind cluster set-up
run: |
Expand Down Expand Up @@ -484,4 +484,3 @@ jobs:
echo "======================================================================================================================"
kubectl describe pods -n ${{ env.VCLUSTER_NAMESPACE }}
exit 1

6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Cosgin
uses: sigstore/cosign-installer@main
with:
cosign-release: "v2.2.3"
cosign-release: "v2.4.0"
- name: Setup Syft
uses: anchore/sbom-action/download-syft@v0.17.2
- name: Set up QEMU
Expand All @@ -39,7 +39,7 @@ jobs:
uses: docker/setup-buildx-action@v3
- uses: azure/setup-helm@v4
with:
version: "v3.0.2"
version: "v3.15.4"
- id: get_version
run: |
RELEASE_VERSION=$(echo $GITHUB_REF | sed -nE 's!refs/tags/!!p')
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
uses: actions/checkout@v4
- uses: azure/setup-helm@v4
with:
version: "v3.0.2"
version: "v3.15.4"
- run: |
RELEASE_VERSION=$(echo $GITHUB_REF | sed -nE 's!refs/tags/v!!p')
helm plugin install https://github.com/chartmuseum/helm-push.git
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
name: Execute all go tests
runs-on: ubuntu-22.04
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version-file: "go.mod"
cache: false
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ ARG KINE_VERSION="v0.12.2"
FROM rancher/kine:${KINE_VERSION} as kine

# Build program
FROM golang:1.22 as builder
FROM golang:1.23.1 AS builder

WORKDIR /vcluster-dev
ARG TARGETOS
ARG TARGETARCH
ARG BUILD_VERSION=dev
# TODO https://docs.docker.com/build/building/secrets/#secret-mounts
ARG TELEMETRY_PRIVATE_KEY=""
ARG HELM_VERSION="v3.13.3"
ARG HELM_VERSION="v3.15.4"

# Install kubectl for development
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/${TARGETARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin/kubectl
Expand All @@ -34,8 +35,8 @@ COPY cmd/vclusterctl cmd/vclusterctl
COPY pkg/ pkg/
COPY config/ config/

ENV GO111MODULE on
ENV DEBUG true
ENV GO111MODULE=on
ENV DEBUG=true

# create and set GOCACHE now, this should slightly speed up the first build inside of the container
# also create /.config folder for GOENV, as dlv needs to write there when starting debugging
Expand All @@ -44,7 +45,7 @@ ENV GOCACHE=/.cache
ENV GOENV=/.config

# Set home to "/" in order to for kubectl to automatically pick up vcluster kube config
ENV HOME /
ENV HOME=/

# Build cmd
RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
Expand All @@ -57,7 +58,7 @@ RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
ENTRYPOINT ["go", "run", "-mod", "vendor", "cmd/vcluster/main.go", "start"]

# we use alpine for easier debugging
FROM alpine:3.20
FROM alpine:3.20.2

# Set root path as working directory
WORKDIR /
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22 as builder
FROM golang:1.23.0 AS builder

WORKDIR /vcluster-dev
ARG TARGETOS
Expand All @@ -22,8 +22,8 @@ COPY chart/ chart/
COPY hack/ hack/
RUN go generate -tags embed_chart ./...

ENV GO111MODULE on
ENV DEBUG true
ENV GO111MODULE=on
ENV DEBUG=true

# create and set GOCACHE now, this should slightly speed up the first build inside of the container
RUN mkdir -p /.cache
Expand All @@ -33,7 +33,7 @@ ENV GOCACHE=/.cache
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -mod vendor -tags embed_chart -o /vcluster cmd/vclusterctl/main.go

# we use alpine for easier debugging
FROM alpine:3.20
FROM alpine:3.20.2
# Set home to "/" in order to for kubectl to automatically pick up vcluster kube config
ENV KUBECONFIG=/root/.kube/config
COPY --from=builder /vcluster /usr/local/bin/vcluster
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.cli.release
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# we use alpine for easier debugging
FROM alpine:3.20
FROM alpine:3.20.2

ARG HELM_VERSION="v3.13.3"
ARG HELM_VERSION="v3.15.4"
ARG TARGETARCH

# Set root path as working directory
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.release
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ARG KINE_VERSION="v0.12.2"
FROM rancher/kine:${KINE_VERSION} as kine
FROM rancher/kine:${KINE_VERSION} AS kine

# Build the manager binary
FROM alpine:3.20 as builder
FROM alpine:3.20.2 AS builder

WORKDIR /vcluster-dev

ARG TARGETOS
ARG TARGETARCH

ARG HELM_VERSION="v3.13.3"
ARG HELM_VERSION="v3.15.4"

# Add curl
RUN apk add --no-cache curl
Expand All @@ -18,7 +18,7 @@ RUN apk add --no-cache curl
RUN curl -s https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz > helm3.tar.gz && tar -zxvf helm3.tar.gz linux-${TARGETARCH}/helm && chmod +x linux-${TARGETARCH}/helm && mv linux-${TARGETARCH}/helm /usr/local/bin/helm && rm helm3.tar.gz && rm -R linux-${TARGETARCH}

# we use alpine for easier debugging
FROM alpine:3.20
FROM alpine:3.20.2

# Set root path as working directory
WORKDIR /
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/_init-containers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

{{/* Bump $defaultTag value whenever k8s version is bumped */}}
{{- define "vcluster.k8s.controllerManager.image.tag" -}}
{{- $defaultTag := "v1.30.2" -}}
{{- $defaultTag := "v1.30.4" -}}
{{- if and (not (empty .Values.controlPlane.distro.k8s.version)) (eq .Values.controlPlane.distro.k8s.controllerManager.image.tag $defaultTag) -}}
{{ .Values.controlPlane.distro.k8s.version}}
{{- else -}}
Expand All @@ -20,7 +20,7 @@

{{/* Bump $defaultTag value whenever k8s version is bumped */}}
{{- define "vcluster.k8s.apiServer.image.tag" -}}
{{- $defaultTag := "v1.30.2" -}}
{{- $defaultTag := "v1.30.4" -}}
{{- if and (not (empty .Values.controlPlane.distro.k8s.version)) (eq .Values.controlPlane.distro.k8s.apiServer.image.tag $defaultTag) -}}
{{ .Values.controlPlane.distro.k8s.version}}
{{- else -}}
Expand All @@ -31,7 +31,7 @@

{{/* Bump $defaultTag value whenever k8s version is bumped */}}
{{- define "vcluster.k8s.scheduler.image.tag" -}}
{{- $defaultTag := "v1.30.2" -}}
{{- $defaultTag := "v1.30.4" -}}
{{- if and (not (empty .Values.controlPlane.distro.k8s.version)) (eq .Values.controlPlane.distro.k8s.scheduler.image.tag $defaultTag) -}}
{{ .Values.controlPlane.distro.k8s.version}}
{{- else -}}
Expand Down
Loading
Loading