Skip to content
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OS ?= $(shell uname -s)
OS := $(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
K8S_LATEST_VER ?= $(shell curl -s https://dl.k8s.io/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= main
TAG ?= v1.17.0
PULL_POLICY ?= IfNotPresent

.PHONY: all
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- "--v=5"
- "--version=main"
- "--version=v1.17.0"
- "--agent-in-mgmt-cluster=false"
env:
- name: GOMEMLIMIT
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ spec:
template:
spec:
initContainers:
- image: docker.io/projectsveltos/addon-controller:main
- image: docker.io/projectsveltos/addon-controller:v1.17.0
name: initialization
containers:
- image: docker.io/projectsveltos/addon-controller:main
- image: docker.io/projectsveltos/addon-controller:v1.17.0
name: controller
6 changes: 4 additions & 2 deletions controllers/flux_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ const (
bucketScheme = "bucket"
)

func prepareFileSystemWithFluxSource(source sourcev1.Source, logger logr.Logger) (string, error) {
func prepareFileSystemWithFluxSource(ctx context.Context, source sourcev1.Source, logger logr.Logger,
) (string, error) {

if source.GetArtifact() == nil {
msg := "Source is not ready, artifact not found"
logger.V(logs.LogInfo).Info(msg)
Expand Down Expand Up @@ -69,7 +71,7 @@ func prepareFileSystemWithFluxSource(source sourcev1.Source, logger logr.Logger)
fetch.WithHostnameOverwrite(os.Getenv("SOURCE_CONTROLLER_LOCALHOST")))

// Download artifact and extract files to the tmp dir.
err = artifactFetcher.Fetch(source.GetArtifact().URL, source.GetArtifact().Digest, tmpDir)
err = artifactFetcher.FetchWithContext(ctx, source.GetArtifact().URL, source.GetArtifact().Digest, tmpDir)
if err != nil {
return "", err
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/handlers_helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -5387,7 +5387,7 @@ func getHelmChartAndRepoName(ctx context.Context, clusterSummary *configv1beta1.
}

s := source.(sourcev1.Source)
tmpDir, err = prepareFileSystemWithFluxSource(s, logger)
tmpDir, err = prepareFileSystemWithFluxSource(ctx, s, logger)
if err != nil {
return "", "", "", err
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/handlers_kustomize.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ func prepareFileSystem(ctx context.Context, c client.Client,
}

s := source.(sourcev1.Source)
return prepareFileSystemWithFluxSource(s, logger)
return prepareFileSystemWithFluxSource(ctx, s, logger)
}

// prepareFileSystemWithRemoteURL fetches the Kustomize directory content referenced by
Expand Down
2 changes: 1 addition & 1 deletion controllers/handlers_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func deployContentOfSource(ctx context.Context, deployingToMgmtCluster bool, des

s := source.(sourcev1.Source)

tmpDir, err := prepareFileSystemWithFluxSource(s, logger)
tmpDir, err := prepareFileSystemWithFluxSource(ctx, s, logger)
if err != nil {
return nil, err
}
Expand Down
44 changes: 22 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/dariubs/percent v1.0.0
github.com/docker/cli v29.9.2+incompatible
github.com/fluxcd/pkg/apis/meta v1.36.0
github.com/fluxcd/pkg/http/fetch v0.28.0
github.com/fluxcd/pkg/tar v1.3.0
github.com/fluxcd/source-controller/api v1.9.6
github.com/fluxcd/pkg/apis/meta v1.38.0
github.com/fluxcd/pkg/http/fetch v0.31.0
github.com/fluxcd/pkg/tar v1.4.0
github.com/fluxcd/source-controller/api v1.10.1
github.com/gdexlab/go-render v1.0.1
github.com/go-logr/logr v1.4.4
github.com/google/go-containerregistry v0.22.1
Expand All @@ -20,20 +20,20 @@ require (
github.com/onsi/gomega v1.44.0
github.com/opencontainers/image-spec v1.1.1
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v1.16.1-0.20261028113114-eb12e8579496
github.com/projectsveltos/libsveltos v1.17.0
github.com/prometheus/client_golang v1.25.0
github.com/sigstore/cosign/v3 v3.1.4
github.com/sigstore/sigstore v1.11.1
github.com/sigstore/sigstore v1.11.2
github.com/spf13/pflag v1.0.10
github.com/yuin/gopher-lua v1.1.2
golang.org/x/text v0.43.0
helm.sh/helm/v4 v4.3.1
k8s.io/api v0.37.1
k8s.io/apiextensions-apiserver v0.37.1
k8s.io/apimachinery v0.37.1
k8s.io/cli-runtime v0.37.1
k8s.io/client-go v0.37.1
k8s.io/component-base v0.37.1
k8s.io/api v0.37.2
k8s.io/apiextensions-apiserver v0.37.2
k8s.io/apimachinery v0.37.2
k8s.io/cli-runtime v0.37.2
k8s.io/client-go v0.37.2
k8s.io/component-base v0.37.2
k8s.io/klog/v2 v2.140.0
k8s.io/utils v0.0.0-20261023123148-ca04ba58ecab
oras.land/oras-go/v2 v2.7.0
Expand All @@ -46,7 +46,7 @@ require (
)

require (
cel.dev/cel-go v0.33.1 // indirect
cel.dev/cel-go v0.33.2 // indirect
cel.dev/expr v0.25.2 // indirect
cloud.google.com/go/compute/metadata v0.10.0 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
Expand Down Expand Up @@ -86,8 +86,8 @@ require (
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2 v1.47.5 // indirect
github.com/aws/aws-sdk-go-v2/config v1.33.12 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.12 // indirect
github.com/aws/aws-sdk-go-v2/config v1.33.13 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.13 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.8 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.8 // indirect
Expand All @@ -96,9 +96,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.10 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.23 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.8 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.12.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.39.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.0 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.39.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.44.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.51.6 // indirect
github.com/aws/smithy-go v1.28.7 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.12.0 // indirect
Expand Down Expand Up @@ -130,7 +130,7 @@ require (
github.com/fatih/color v1.19.0 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/fluxcd/cli-utils v1.2.2 // indirect
github.com/fluxcd/pkg/apis/acl v0.10.0 // indirect
github.com/fluxcd/pkg/apis/acl v0.12.0 // indirect
github.com/fsnotify/fsnotify v1.10.1 // indirect
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
github.com/go-chi/chi/v5 v5.4.0 // indirect
Expand Down Expand Up @@ -216,7 +216,7 @@ require (
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
github.com/oklog/ulid/v2 v2.1.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/go-digest/blake3 v0.0.0-20260615172202-b50d36f46dea // indirect
github.com/opencontainers/go-digest/blake3 v0.0.0-20261015205711-63db54280247 // indirect
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/phuslu/lru v1.0.18 // indirect
Expand Down Expand Up @@ -296,11 +296,11 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.3 // indirect
gotest.tools/v3 v3.4.0 // indirect
k8s.io/apiserver v0.37.1 // indirect
k8s.io/apiserver v0.37.2 // indirect
k8s.io/cluster-bootstrap v0.36.3 // indirect
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
k8s.io/kubectl v0.37.1 // indirect
k8s.io/streaming v0.37.1 // indirect
k8s.io/streaming v0.37.2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
Expand Down
Loading
Loading