actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-09 09:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3404 from fluxcd/azure-e2e-fixes

Browse source 
e2e: Fix Azure test suite
This commit is contained in:
Stefan Prodan 2022-12-14 12:44:43 +02:00 committed by GitHub
commit 96b96ac78e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/e2e.yaml vendored
View file

@ -222,14 +222,13 @@ jobs:
/tmp/flux create source git flux-system \
--url=https://github.com/fluxcd/flux2-kustomize-helm-example \
--branch=main \
--ignore-paths="./clusters/**/flux-system/" \
--recurse-submodules
/tmp/flux create kustomization flux-system \
--source=flux-system \
--path=./clusters/staging
kubectl -n flux-system wait kustomization/infrastructure --for=condition=ready --timeout=5m
kubectl -n flux-system wait kustomization/infra-controllers --for=condition=ready --timeout=5m
kubectl -n flux-system wait kustomization/apps --for=condition=ready --timeout=5m
kubectl -n nginx wait helmrelease/nginx --for=condition=ready --timeout=5m
kubectl -n redis wait helmrelease/redis --for=condition=ready --timeout=5m
kubectl -n podinfo wait helmrelease/podinfo --for=condition=ready --timeout=5m
- name: flux tree
run: |

4
tests/azure/azure_test.go
View file

@ -283,7 +283,7 @@ func TestAzureDevOpsCloning(t *testing.T) {
name: foobar
namespace: %s
`, tt.name)
name := fmt.Sprintf("./cloning-test/%s/configmap.yaml", tt.name)
name := fmt.Sprintf("cloning-test/%s/configmap.yaml", tt.name)
files[name] = strings.NewReader(manifest)
}
@ -554,7 +554,7 @@ stringData:
require.NoError(t, err)
files := make(map[string]io.Reader)
files["./key-vault-sops/secret.enc.yaml"] = r
files["key-vault-sops/secret.enc.yaml"] = r
err = commitAndPushAll(repo, files, name)
require.NoError(t, err)

12
tests/azure/util_test.go
View file

@ -129,7 +129,7 @@ func installFlux(ctx context.Context, kubeClient client.Client, kubeconfigPath,
//// Install Flux and push files to git repository
repo, _, err := getRepository(repoUrl, defaultBranch, true, azdoPat)
if err != nil {
return err
return fmt.Errorf("error cloning repositoriy: %w", err)
}
kustomizeYaml := `
@ -168,19 +168,19 @@ patchesStrategicMerge:
`
files := make(map[string]io.Reader)
files["./clusters/e2e/flux-system/kustomization.yaml"] = strings.NewReader(kustomizeYaml)
files["./clusters/e2e/flux-system/gotk-components.yaml"] = strings.NewReader("")
files["./clusters/e2e/flux-system/gotk-sync.yaml"] = strings.NewReader("")
files["clusters/e2e/flux-system/kustomization.yaml"] = strings.NewReader(kustomizeYaml)
files["clusters/e2e/flux-system/gotk-components.yaml"] = strings.NewReader("")
files["clusters/e2e/flux-system/gotk-sync.yaml"] = strings.NewReader("")
err = commitAndPushAll(repo, files, defaultBranch)
if err != nil {
return err
return fmt.Errorf("error commiting and pushing manifests: %w", err)
}
bootstrapCmd := fmt.Sprintf("flux bootstrap git --url=%s --password=%s --kubeconfig=%s"+
" --token-auth --path=clusters/e2e --components-extra image-reflector-controller,image-automation-controller",
repoUrl, azdoPat, kubeconfigPath)
if err := runCommand(context.Background(), 10*time.Minute, "./", bootstrapCmd); err != nil {
return err
return fmt.Errorf("error running bootstrap: %w", err)
}
return nil