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.

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

Provide different OpenShift and non-OpenShift watches yaml files #711

Merged
merged 1 commit into from
Oct 27, 2023
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
3 changes: 2 additions & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ USER ${USER_UID}

COPY roles/ ${HOME}/roles/
COPY playbooks/ ${HOME}/playbooks/
COPY watches.yaml ${HOME}/watches.yaml
COPY watches-k8s.yaml ${HOME}/watches-k8s.yaml
COPY watches-os.yaml ${HOME}/watches-os.yaml

COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ spec:
args:
- "--zap-log-level=info"
- "--leader-election-id=kiali-operator"
- "--watches-file=./watches-os.yaml"
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand Down
24 changes: 24 additions & 0 deletions watches-k8s.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# KUBERNETES/NON-OPENSHIFT WATCHES YAML
---
# The normal Kiali CR processing playbook
- version: v1alpha1
group: kiali.io
kind: Kiali
playbook: playbooks/kiali-deploy.yml
reconcilePeriod: "0s"
watchDependentResources: False
watchClusterScopedResources: False
watchAnnotationsChanges: True
finalizer:
name: kiali.io/finalizer
playbook: playbooks/kiali-remove.yml
# Watching new namespaces so the operator can determine if they should be accessible to Kiali
- version: v1
group: ""
kind: Namespace
playbook: playbooks/kiali-new-namespace-detected.yml
reconcilePeriod: "0s"
manageStatus: False
watchDependentResources: False
watchClusterScopedResources: False
watchAnnotationsChanges: False
1 change: 1 addition & 0 deletions watches.yaml → watches-os.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# OPENSHIFT WATCHES YAML
---
# The normal Kiali CR processing playbook
- version: v1alpha1
Expand Down