chore: post release cleanup (#83)

* chore: remove workaround in CI Signed-off-by: Bence Csati <[email protected]> * fix: deploy with garden Signed-off-by: Bence Csati <[email protected]> --------- Signed-off-by: Bence Csati <[email protected]>
bank-vaults · Jun 25, 2024 · a846081 · a846081
1 parent 4850584
commit a846081
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -266,9 +266,7 @@ jobs:
           name: "[helm-chart] package"
 
       - name: Test
-        # Workaround until we have a release
-        # run: nix develop --impure .#ci -c make test-e2e
-        run: nix develop --impure .#ci -c make test-e2e-local
+        run: nix develop --impure .#ci -c make test-e2e
         env:
           KIND_K8S_VERSION: ${{ matrix.k8s_version }}
           LOAD_IMAGE_ARCHIVE: ${{ github.workspace }}/docker.tar

diff --git a/.yamlignore b/.yamlignore
@@ -1,3 +1,4 @@
 /deploy/
 /e2e/deploy/
 /e2e/test/
+/.github/
diff --git a/.yamllint.yaml b/.yamllint.yaml
@@ -4,3 +4,4 @@ extends: default
 
 rules:
   line-length: disable
+  document-start: disable
diff --git a/e2e/main_test.go b/e2e/main_test.go
@@ -43,9 +43,7 @@ import (
 	"sigs.k8s.io/e2e-framework/third_party/helm"
 )
 
-const (
-	defaultTimeout = 2 * time.Minute
-)
+const defaultTimeout = 2 * time.Minute
 
 var testenv env.Environment
 
@@ -113,14 +111,14 @@ func TestMain(m *testing.M) {
 
 		// Unsealing and Vault access only works in the default namespace at the moment
 		testenv.Setup(useNamespace("default"))
-
-		testenv.Setup(installVault, waitForVaultTLS)
-		testenv.Finish(uninstallVault)
 	} else {
 		// Unsealing and Vault access only works in the default namespace at the moment
 		testenv.Setup(useNamespace("default"))
 	}
 
+	testenv.Setup(installVault, waitForVaultTLS)
+	testenv.Finish(uninstallVault)
+
 	os.Exit(testenv.Run(m))
 }
 

diff --git a/garden.yaml b/garden.yaml
@@ -7,37 +7,24 @@ spec:
     name: oci://ghcr.io/bank-vaults/helm-charts/vault-operator
     version: "1.22.2"
 
----
-kind: Deploy
-type: kubernetes
-name: vault
-dependencies:
-  - deploy.vault-operator
-spec:
-  namespace: default
-  files:
-    - ./e2e/deploy/vault/rbac.yaml
-    - ./e2e/deploy/vault/vault.yaml
-
 ---
 kind: Build
 type: container
-name: secrets-webhook
+name: secrets-webhook-image
 exclude:
   - .direnv/**/*
   - .devenv/**/*
   - build/**/*
   - e2e/**/*
+  - examples/**/*
 
 ---
 kind: Deploy
 type: helm
 name: secrets-webhook
 dependencies:
-  - deploy.vault
-variables:
-  repository: ${actions.build.secrets-webhook.outputs.deployment-image-name}
-  tag: ${actions.build.secrets-webhook.version}
+  - build.secrets-webhook-image
+  - deploy.vault-operator
 spec:
   namespace: secrets-webhook
   chart:
@@ -46,5 +33,5 @@ spec:
     - ./e2e/deploy/secrets-webhook/values.yaml
   values:
     image:
-      repository: ${var.repository}
-      tag: ${var.tag}
+      repository: ${actions.build.secrets-webhook-image.outputs.deployment-image-name}
+      tag: ${actions.build.secrets-webhook-image.version}
diff --git a/project.garden.yaml b/project.garden.yaml
@@ -21,3 +21,4 @@ scan:
     - .devenv/**/*
     - build/**/*
     - e2e/**/*
+    - examples/**/*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ extends: default

		rules:
		line-length: disable
		document-start: disable