actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-22 15:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3415 from souleb/issue-3411

Browse source 
Fix dry-run still loading kubeconfig issue
This commit is contained in:
Stefan Prodan 2022-12-17 08:49:43 +02:00 committed by GitHub
commit e81201b8cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/flux/build_kustomization.go
View file

@ -88,12 +88,22 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) {
} }
} }
builder, err := build.NewBuilder(name, buildKsArgs.path, var builder *build.Builder
build.WithClientConfig(kubeconfigArgs, kubeclientOptions), if buildKsArgs.dryRun {
build.WithTimeout(rootArgs.timeout), builder, err = build.NewBuilder(name, buildKsArgs.path,
build.WithKustomizationFile(buildKsArgs.kustomizationFile), build.WithTimeout(rootArgs.timeout),
build.WithDryRun(buildKsArgs.dryRun), build.WithKustomizationFile(buildKsArgs.kustomizationFile),
) build.WithDryRun(buildKsArgs.dryRun),
build.WithNamespace(*kubeconfigArgs.Namespace),
)
} else {
builder, err = build.NewBuilder(name, buildKsArgs.path,
build.WithClientConfig(kubeconfigArgs, kubeclientOptions),
build.WithTimeout(rootArgs.timeout),
build.WithKustomizationFile(buildKsArgs.kustomizationFile),
)
}
if err != nil { if err != nil {
return err return err
} }

2
cmd/flux/testdata/build-kustomization/delete-service/hpa.yaml vendored
View file

@ -1,4 +1,4 @@
apiVersion: autoscaling/v2beta2 apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
name: podinfo name: podinfo

2
cmd/flux/testdata/build-kustomization/podinfo-result.yaml vendored
View file

@ -77,7 +77,7 @@ spec:
cpu: 100m cpu: 100m
memory: 64Mi memory: 64Mi
--- ---
apiVersion: autoscaling/v2beta2 apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
labels: labels:

2
cmd/flux/testdata/build-kustomization/podinfo-without-service-result.yaml vendored
View file

@ -77,7 +77,7 @@ spec:
cpu: 100m cpu: 100m
memory: 64Mi memory: 64Mi
--- ---
apiVersion: autoscaling/v2beta2 apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
labels: labels:

2
cmd/flux/testdata/build-kustomization/podinfo/hpa.yaml vendored
View file

@ -1,4 +1,4 @@
apiVersion: autoscaling/v2beta2 apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
name: podinfo name: podinfo

8
internal/build/build.go
View file

@ -139,6 +139,14 @@ func WithClientConfig(rcg *genericclioptions.ConfigFlags, clientOpts *runclient.
} }
} }
// WithNamespace sets the namespace
func WithNamespace(namespace string) BuilderOptionFunc {
return func(b *Builder) error {
b.namespace = namespace
return nil
}
}
// WithDryRun sets the dry-run flag // WithDryRun sets the dry-run flag
func WithDryRun(dryRun bool) BuilderOptionFunc { func WithDryRun(dryRun bool) BuilderOptionFunc {
return func(b *Builder) error { return func(b *Builder) error {