Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-latest
os-name: linux
timeout-minutes: 90
label-filter: "-ginkgo.label-filter='!(application, leaf-policy)'"
label-filter: "-ginkgo.label-filter='!(application)'"
kubectl-version: "v1.23.3"
login_user_type: "cluster-user"
git-provider: gitlab
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
os-name: linux
timeout-minutes: 90
label-filter: "-ginkgo.label-filter='!(capd)'"
label-filter: "-ginkgo.label-filter='!(capd, leaf-policy)'"
kubectl-version: "v1.23.6"
login_user_type: "oidc"
git-provider: github
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: macOS-latest
os-name: darwin
timeout-minutes: 90
label-filter: "-ginkgo.label-filter='!(upgrade, capd, kind-gitops-cluster)'"
label-filter: "-ginkgo.label-filter='!(upgrade, capd, kind-gitops-cluster, leaf-policy)'"
kubectl-version: "v1.23.3"
login_user_type: "cluster-user"
git-provider: gitlab
Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/test/ui_policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func installPolicyAgent(clusterName string) {
})

By(fmt.Sprintf("And install policy agent to %s cluster", clusterName), func() {
err := runCommandPassThrough("helm", "upgrade", "--install", "weave-policy-agent", "charts-profile/weave-policy-agent", "--version", "0.3.x", "--set", "accountId=weaveworks", "--set", "clusterId="+clusterName)
err := runCommandPassThrough("helm", "upgrade", "--install", "weave-policy-agent", "charts-profile/weave-policy-agent", "--namespace", "policy-system", "--create-namespace", "--version", "0.3.x", "--set", "accountId=weaveworks", "--set", "clusterId="+clusterName)
Expect(err).ShouldNot(HaveOccurred(), "Failed to install policy agent to leaf cluster: "+clusterName)
})
}
Expand Down
4 changes: 3 additions & 1 deletion test/acceptance/test/ui_violations.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ func DescribeViolations(gitopsTestRunner GitopsTestRunner) {

JustAfterEach(func() {
_ = gitopsTestRunner.KubectlDelete([]string{}, policiesYaml)
_ = gitopsTestRunner.KubectlDelete([]string{}, deploymentYaml)

})

It("Verify Violations can be monitored for violating resource", Label("integration", "violation"), func() {
Expand All @@ -41,7 +43,7 @@ func DescribeViolations(gitopsTestRunner GitopsTestRunner) {

By("Install violating Postgres deployment to the management cluster", func() {
Expect(waitForResource("policy", policyID, "default", "", ASSERTION_1MINUTE_TIME_OUT))
Expect(gitopsTestRunner.KubectlApply([]string{}, deploymentYaml)).ShouldNot(Succeed(), "Failed to install test Postgres deployment to management cluster")
Expect(gitopsTestRunner.KubectlApply([]string{}, deploymentYaml)).ShouldNot(Succeed(), "Test Postgres deployment should not be installed in the management cluster")
})

By("And wait for violations to be visibe on the dashboard", func() {
Expand Down
1 change: 1 addition & 0 deletions test/utils/scripts/wego-enterprise.sh
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ function setup {

# Install policy agent to enforce rego policies - (Installing policy agent after capi because capi violates some of thge policies and failed to install)
helm upgrade --install weave-policy-agent profiles-catalog/weave-policy-agent \
--namespace policy-system --create-namespace \
--version 0.3.x \
--set accountId=weaveworks \
--set clusterId=${MANAGEMENT_CLUSTER_CNAME}
Expand Down