Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dry-run still loading kubeconfig issue

Browse Source 
If this is implemented, it will not assume that access to a kubeconfig
is guaranteed even if just for retrieving configured namespace.

Signed-off-by: Soule BA <soule@weave.works>
This commit is contained in:
Soule BA
2022-12-17 00:29:10 +01:00
parent 49eb1c5444
commit 2c1085d9ce
6 changed files with 28 additions and 10 deletions
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,
build.WithClientConfig(kubeconfigArgs, kubeclientOptions),
build.WithTimeout(rootArgs.timeout),
build.WithKustomizationFile(buildKsArgs.kustomizationFile),
build.WithDryRun(buildKsArgs.dryRun),
)
var builder *build.Builder
if buildKsArgs.dryRun {
builder, err = build.NewBuilder(name, buildKsArgs.path,
build.WithTimeout(rootArgs.timeout),
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 {
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
metadata:
name: podinfo

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

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

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

@@ -77,7 +77,7 @@ spec:
cpu: 100m
memory: 64Mi
---
apiVersion: autoscaling/v2beta2
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
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
metadata:
name: podinfo