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

fix: add missing policyrules for rabbitmq and mogdb #1434

Merged
merged 1 commit into from
Feb 5, 2025
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
7 changes: 7 additions & 0 deletions addons/mogdb/templates/cmpd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ spec:
else
echo -n "secondary"
fi
policyRules:
- apiGroups:
- ""
resources:
- "pods/exec"
verbs:
- "create"
runtime:
shareProcessNamespace: true
securityContext:
Expand Down
13 changes: 13 additions & 0 deletions addons/rabbitmq/templates/componentdefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ spec:
value: $(CLUSTER_COMPONENT_NAME)-headless
- name: RABBITMQ_NODENAME
value: rabbit@$(POD_NAME).$(K8S_SERVICE_NAME).$(POD_NAMESPACE)
policyRules:
- apiGroups:
- ""
resources:
- endpoints
verbs:
- get
- apiGroups:
- ""
resources:
- events
verbs:
- create
runtime:
containers:
- name: rabbitmq
Expand Down
35 changes: 0 additions & 35 deletions examples/mogdb/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ spec:
- name: mogdb
componentDef: mogdb
serviceVersion: "5.0.5"
serviceAccountName: kb-mogdb-cluster
replicas: 2
# Specifies the resources required by the Component.
resources:
Expand All @@ -42,37 +41,3 @@ spec:
requests:
# Set the storage size as needed
storage: 20Gi
---
# Source: mogdb-cluster/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: mogdb-cluster-switchover-role
namespace: default
labels:
helm.sh/chart: mogdb-cluster-1.0.0-alpha.0
app.kubernetes.io/version: "5.0.5"
app.kubernetes.io/instance: mogdb-cluster
app.kubernetes.io/required-by: pod
rules:
- apiGroups: [""]
resources: ["pods/exec"]
verbs: ["create"]
---
# Source: mogdb-cluster/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: mogdb-cluster-switchover
namespace: default
labels:
helm.sh/chart: mogdb-cluster-1.0.0-alpha.0
app.kubernetes.io/version: "5.0.5"
app.kubernetes.io/instance: mogdb-cluster
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: mogdb-cluster-switchover-role
subjects:
- kind: ServiceAccount
name: kb-mogdb-cluster
1 change: 0 additions & 1 deletion examples/mogdb/switchover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ spec:
custom:
# Specifies the name of the OpsDefinition, it is a custom-defined ops to perform switch-over for mogdb
opsDefinitionName: mogdb-switchover
serviceAccountName: kb-mogdb-cluster
components:
- componentName: mogdb
parameters:
Expand Down
42 changes: 0 additions & 42 deletions examples/rabbitmq/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ spec:
# provisioned by this Component.
# Valid options are: [3.10.25,3.11.28,3.12.14,3.13.2,3.13.7,3.8.14,3.9.29]
serviceVersion: 3.13.7
# Specifies the name of the ServiceAccount required by the running Component.
# RabbitMQ needs `peer-discovery` role to create events and get endpoiints
# This is essential for discovering other RabbitMQ nodes and forming a cluster.
serviceAccountName: kb-rabbitmq-cluster
# Recommended to set `replicas` to [3,5,7]
# All data/state is replicated across all replicas.
replicas: 3
Expand Down Expand Up @@ -52,41 +48,3 @@ spec:
requests:
# Set the storage size as needed
storage: 20Gi
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: rabbitmq-cluster-peer-discovery
namespace: default
rules:
- apiGroups:
- ""
resources:
- endpoints
verbs:
- get
- apiGroups:
- ""
resources:
- events
verbs:
- create
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: kb-rabbitmq-cluster
namespace: default
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: kb-rabbitmq-cluster
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: rabbitmq-cluster-peer-discovery
subjects:
- kind: ServiceAccount
name: kb-rabbitmq-cluster
namespace: default
Loading