Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Fix tests migrated to Chainsaw #2650

Merged
merged 1 commit into from
Feb 21, 2024
Merged

[Chore] Fix tests migrated to Chainsaw #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .chainsaw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ metadata:
spec:
parallel: 4
timeouts:
assert: 5m0s
assert: 6m0s
cleanup: 5m0s
delete: 5m0s
error: 5m0s
apply: 10s
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
path: bin
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
- name: Install chainsaw
uses: kyverno/[email protected].4
uses: kyverno/[email protected].6
- name: Install tools
run: make install-tools
- name: Prepare e2e tests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ KUSTOMIZE_VERSION ?= v5.0.3
CONTROLLER_TOOLS_VERSION ?= v0.12.0
GOLANGCI_LINT_VERSION ?= v1.54.0
KIND_VERSION ?= v0.20.0
CHAINSAW_VERSION ?= v0.1.4
CHAINSAW_VERSION ?= v0.1.6

.PHONY: install-tools
install-tools: kustomize golangci-lint kind controller-gen envtest crdoc kind operator-sdk chainsaw
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-autoscale/autoscale/02-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- --otlp-insecure
# High duration to ensure the trace creation doesn't stop.
# It'll be stopped in step 4
- --duration=1m
- --duration=6m
- --workers=20
- traces
restartPolicy: Never
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-apache-httpd/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,26 @@ kind: Test
metadata:
name: instrumentation-apache-httpd
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 3000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=3000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-dotnet-musl/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-dotnet-musl
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-dotnet/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-dotnet
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-go/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-go
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 0/0
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=0/0
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-java-other-ns/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-java-other-ns
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-01
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- delete:
ref:
apiVersion: v1
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-java/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-java
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-nginx-contnr-secctx
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 3000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=3000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-nginx-multicontainer/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-nginx-multicontainer
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 3000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=3000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-nginx/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-nginx
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 3000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=3000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-nodejs/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-nodejs
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
22 changes: 17 additions & 5 deletions tests/e2e-instrumentation/instrumentation-python/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@ metadata:
creationTimestamp: null
name: instrumentation-python
spec:
namespaceTemplate:
metadata:
annotations:
openshift.io/sa.scc.uid-range: 1000/1000
openshift.io/sa.scc.supplemental-groups: 2000/1000
steps:
- name: step-00
try:
# In OpenShift, when a namespace is created, all necessary SCC annotations are automatically added. However, if a namespace is created using a resource file with only selected SCCs, the other auto-added SCCs are not included. Therefore, the UID-range and supplemental groups SCC annotations must be set after the namespace is created.
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.uid-range=1000/1000
- --overwrite
- command:
entrypoint: kubectl
args:
- annotate
- namespace
- ${NAMESPACE}
- openshift.io/sa.scc.supplemental-groups=2000/1000
- --overwrite
- apply:
file: 00-install-collector.yaml
- apply:
Expand Down
Loading
Loading