Skip to content

Flux v2.6.0 #457

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

Merged
merged 5 commits into from
Jun 19, 2025
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
run: |
[ -z "${GOPATH}" ] && export GOPATH=$HOME/go
PATH="${GOPATH}/bin:${PATH}"
kind create cluster --image kindest/node:v1.31.0
kind create cluster --image kindest/node:v1.32.0
echo "sleep 60s to wait node ready"
sleep 60s
kubectl get node
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG TARGETOS
# Build
RUN mkdir bin
RUN apt install -y curl tar
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/${TARGETOS}/${TARGETARCH}/kubectl
RUN curl -LO https://dl.k8s.io/release/v1.32.0/bin/${TARGETOS}/${TARGETARCH}/kubectl
RUN chmod +x ./kubectl
RUN mv kubectl bin
RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_${TARGETOS}_${TARGETARCH}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-check
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COPY bin/ bin/
RUN apt install -y curl
RUN bin/setup.sh
# Temporary fix see https://github.com/fidelity/kraan/issues/114
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl
RUN curl -LO https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
RUN chmod +x ./kubectl
RUN mv kubectl bin
RUN cp bin/* /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN go mod download
RUN mkdir bin
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go
RUN apt install -y curl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl
RUN curl -LO https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubectl
RUN chmod +x ./kubectl
RUN mv kubectl bin
RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_linux_amd64.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.47
v0.3.48
4 changes: 2 additions & 2 deletions bin/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ linter_version=1.55.2
mockgen_version=v1.6.0
helm_version=v3.6.1
kind_version=v0.11.1
kubectl_version=v1.31.0
kubectl_version=v1.32.0
kustomize_version=v3.8.7

function usage()
Expand Down Expand Up @@ -52,7 +52,7 @@ function install_kind() {
}

function install_kubectl() {
curl -LO https://storage.googleapis.com/kubernetes-release/release/${kubectl_version}/bin/linux/amd64/kubectl
curl -LO https://dl.k8s.io/release/${kubectl_version}/bin/linux/amd64/kubectl
chmod +x ./kubectl
$sudo mv kubectl /usr/local/bin
}
Expand Down
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
description: A Helm chart for kraan controller
name: kraan-controller
type: application
appVersion: v0.3.47
version: v0.3.47
appVersion: v0.3.48
version: v0.3.48
10 changes: 10 additions & 0 deletions chart/templates/gotk/helm-controller/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,11 @@ spec:
DisableSchemaValidation prevents the Helm install action from validating
the values against the JSON Schema.
type: boolean
disableTakeOwnership:
description: |-
DisableTakeOwnership disables taking ownership of existing resources
during the Helm install action. Defaults to false.
type: boolean
disableWait:
description: |-
DisableWait disables the waiting for resources to be ready after a Helm
Expand Down Expand Up @@ -787,6 +792,11 @@ spec:
DisableSchemaValidation prevents the Helm upgrade action from validating
the values against the JSON Schema.
type: boolean
disableTakeOwnership:
description: |-
DisableTakeOwnership disables taking ownership of existing resources
during the Helm upgrade action. Defaults to false.
type: boolean
disableWait:
description: |-
DisableWait disables the waiting for resources to be ready after a Helm
Expand Down
Loading