diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 7337a5f6..52d29fd8 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -93,7 +93,6 @@ jobs: --path="./deploy/overlays/dev" \ --prune=true \ --interval=5m \ - --validation=client \ --health-check="Deployment/frontend.dev" \ --health-check="Deployment/backend.dev" \ --health-check-timeout=3m diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go index e4b8c8f9..fbcfce23 100644 --- a/cmd/flux/create_kustomization.go +++ b/cmd/flux/create_kustomization.go @@ -49,7 +49,6 @@ var createKsCmd = &cobra.Command{ --path="./examples/contour/" \ --prune=true \ --interval=10m \ - --validation=client \ --health-check="Deployment/contour.projectcontour" \ --health-check="DaemonSet/envoy.projectcontour" \ --health-check-timeout=3m @@ -60,8 +59,7 @@ var createKsCmd = &cobra.Command{ --source=GitRepository/webapp \ --path="./deploy/overlays/dev" \ --prune=true \ - --interval=5m \ - --validation=client + --interval=5m # Create a Kustomization using a source from a different namespace flux create kustomization podinfo \ @@ -69,8 +67,7 @@ var createKsCmd = &cobra.Command{ --source=GitRepository/podinfo.flux-system \ --path="./deploy/overlays/dev" \ --prune=true \ - --interval=5m \ - --validation=client + --interval=5m # Create a Kustomization resource that references a Bucket flux create kustomization secrets \ @@ -108,6 +105,8 @@ func init() { createKsCmd.Flags().Var(&kustomizationArgs.decryptionProvider, "decryption-provider", kustomizationArgs.decryptionProvider.Description()) createKsCmd.Flags().StringVar(&kustomizationArgs.decryptionSecret, "decryption-secret", "", "set the Kubernetes secret name that contains the OpenPGP private keys used for sops decryption") createKsCmd.Flags().StringVar(&kustomizationArgs.targetNamespace, "target-namespace", "", "overrides the namespace of all Kustomization objects reconciled by this Kustomization") + createKsCmd.Flags().MarkDeprecated("validation", "this arg is no longer used, all resources are validated using server-side apply dry-run") + createCmd.AddCommand(createKsCmd) } diff --git a/cmd/flux/kustomization_test.go b/cmd/flux/kustomization_test.go index ca3b1c51..275a061d 100644 --- a/cmd/flux/kustomization_test.go +++ b/cmd/flux/kustomization_test.go @@ -14,7 +14,7 @@ func TestKustomizationFromGit(t *testing.T) { "testdata/kustomization/create_source_git.golden", }, { - "create kustomization tkfg --source=tkfg --path=./deploy/overlays/dev --prune=true --interval=5m --validation=client --health-check=Deployment/frontend.dev --health-check=Deployment/backend.dev --health-check-timeout=3m", + "create kustomization tkfg --source=tkfg --path=./deploy/overlays/dev --prune=true --interval=5m --health-check=Deployment/frontend.dev --health-check=Deployment/backend.dev --health-check-timeout=3m", "testdata/kustomization/create_kustomization_from_git.golden", }, { diff --git a/cmd/flux/main.go b/cmd/flux/main.go index 5bd8fa50..43a0f1ab 100644 --- a/cmd/flux/main.go +++ b/cmd/flux/main.go @@ -43,7 +43,7 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.`, flux check --pre # Install the latest version of Flux - flux install --version=master + flux install # Create a source for a public Git repository flux create source git webapp-latest \ @@ -66,7 +66,6 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.`, --path="./deploy/webapp/" \ --prune=true \ --interval=5m \ - --validation=client \ --health-check="Deployment/backend.webapp" \ --health-check="Deployment/frontend.webapp" \ --health-check-timeout=2m