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

Jump to bottom

Add ConfigMap tests supporting AllNamespaces and SingleNamespace install modes #256

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Add ConfigMap tests supporting AllNamespaces and SingleNamespace install modes #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c7009a4
Add configmap tests and update e2e.sh
kabicin Aug 29, 2022
3d199bb
Update fyre-e2e.sh and RBAC to allow configmaps get/list
kabicin Aug 30, 2022
42b7e6a
Add AllNamespaces tests and run once in fyre-e2e.sh
kabicin Aug 31, 2022
997a6f0
Add SingleNamespace tests and update fyre-e2e.sh
kabicin Aug 31, 2022
a606f8a
Support all install modes in fyre-e2e.sh
kabicin Sep 1, 2022
787752e
Add helper functions to fyre-e2e.sh
kabicin Sep 2, 2022
2e3198e
Revert e2e.sh
kabicin Sep 2, 2022
0cad87a
Update RBAC config name
kabicin Sep 2, 2022
732b416
Cleanup fyre-e2e.sh
kabicin Sep 2, 2022
d297e36
Fix OperatorGroup bug for AllNamespaces in fyre-e2e.sh
kabicin Sep 2, 2022
821894d
Merge branch 'main' of github.com:WASdev/websphere-liberty-operator i…
kabicin Oct 4, 2022
42fdce6
Add permissions for watch all/another namespace
kabicin Oct 17, 2022
3029453
Update watcher/watched role/rolebinding
kabicin Oct 20, 2022
a5fbe47
Minimize clusterrole config in AllNamespaces tests
kabicin Oct 20, 2022
a5e3737
Minimize role config
kabicin Oct 20, 2022
5b25e33
Merge branch 'main' of github.com:WASdev/websphere-liberty-operator i…
kabicin Oct 20, 2022
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
8 changes: 8 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: configmap-wsliberty-app
status:
replicas: 1
readyReplicas: 1
updatedReplicas: 1
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/00-dry-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
5 changes: 5 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/01-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- command: kubectl delete webspherelibertyapplications --all --all-namespaces
- command: kubectl delete configmap websphere-liberty-operator -n openshift-operators
5 changes: 5 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/01-errors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
namespace: openshift-operators
5 changes: 5 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
namespace: openshift-operators
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl-all-namespaces/configmap/02-liberty.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
8 changes: 8 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: configmap-wsliberty-app
status:
replicas: 1
readyReplicas: 1
updatedReplicas: 1
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/00-dry-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
6 changes: 6 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/01-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- command: kubectl delete webspherelibertyapplications --all
namespaced: true
- command: kubectl delete configmap websphere-liberty-operator -n WEBSPHERE_LIBERTY_OPERATOR_NAMESPACE
5 changes: 5 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/01-errors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
namespace: WEBSPHERE_LIBERTY_OPERATOR_NAMESPACE
5 changes: 5 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
namespace: WEBSPHERE_LIBERTY_OPERATOR_NAMESPACE
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl-single-namespace/configmap/02-liberty.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
8 changes: 8 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: configmap-wsliberty-app
status:
replicas: 1
readyReplicas: 1
updatedReplicas: 1
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/00-dry-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
7 changes: 7 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/01-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- command: kubectl delete webspherelibertyapplications --all
namespaced: true
- command: kubectl delete configmap websphere-liberty-operator
namespaced: true
4 changes: 4 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/01-errors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
4 changes: 4 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: websphere-liberty-operator
9 changes: 9 additions & 0 deletions bundle/tests/scorecard/kuttl/configmap/02-liberty.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: liberty.websphere.ibm.com/v1
kind: WebSphereLibertyApplication
metadata:
name: configmap-wsliberty-app
spec:
applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
license:
accept: true
replicas: 1
53 changes: 53 additions & 0 deletions config/rbac/kuttl-rbac-watch-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: scorecard-kuttl-watch-all
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: scorecard-kuttl-watch-all
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: scorecard-kuttl-watch-all
subjects:
- kind: ServiceAccount
name: scorecard-kuttl-watch-all
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: scorecard-kuttl-watch-all
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- delete
- apiGroups:
- apps
resources:
- deployments
- statefulsets
verbs:
- get
- create
- patch
- apiGroups:
- liberty.websphere.ibm.com
resources:
- webspherelibertyapplications
- webspherelibertydumps
- webspherelibertytraces
verbs:
- get
- list
- create
- patch
- delete
83 changes: 83 additions & 0 deletions config/rbac/kuttl-rbac-watch-another.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: scorecard-kuttl-watch-another
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: watched-role
namespace: WEBSPHERE_LIBERTY_OPERATOR_NAMESPACE
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: watcher-role
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- delete
- apiGroups:
- apps
resources:
- deployments
- statefulsets
verbs:
- get
- create
- patch
- apiGroups:
- liberty.websphere.ibm.com
resources:
- webspherelibertyapplications
- webspherelibertydumps
- webspherelibertytraces
verbs:
- get
- list
- create
- patch
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: watched-rolebinding
namespace: WEBSPHERE_LIBERTY_OPERATOR_NAMESPACE
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: watched-role
subjects:
- kind: ServiceAccount
name: scorecard-kuttl-watch-another
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: watcher-rolebinding
namespace: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: watcher-role
subjects:
- kind: ServiceAccount
name: scorecard-kuttl-watch-another
8 changes: 8 additions & 0 deletions config/rbac/kuttl-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ rules:
verbs:
- get
- list
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- delete
- apiGroups:
- ""
resources:
Expand Down
Loading