Skip to content

[ISSUE #184 #192] expose acl configuration as configMap #231

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ISSUE #184 #192] expose acl configuration as configMap #231

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
39 changes: 39 additions & 0 deletions example/rocketmq_v1alpha1_broker_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,39 @@ data:
brokerRole=ASYNC_MASTER

---
apiVersion: v1
kind: ConfigMap
metadata:
name: broker-acl-config
data:
plain_acl.yml: |
globalWhiteRemoteAddresses:
- 10.10.103.*
- 192.168.0.*

accounts:
- accessKey: RocketMQ
secretKey: 123456789
Comment on lines +42 to +43
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is any more secure ways to store secretKey? Exposing it in confimap may not be a secure practice, but currently I couldn't find an appropriate way.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we store the whole plain_acl.yml in Secret?

whiteRemoteAddress:
admin: false
defaultTopicPerm: DENY
defaultGroupPerm: SUB
topicPerms:
- topicA=DENY
- topicB=PUB|SUB
- topicC=SUB
groupPerms:
# the group should convert to retry topic
- groupA=DENY
- groupB=PUB|SUB
- groupC=SUB

- accessKey: rocketmq2
secretKey: 123456789
whiteRemoteAddress: 192.168.1.*
# if it is admin, it could access all resources
admin: true
---
apiVersion: rocketmq.apache.org/v1alpha1
kind: Broker
metadata:
Expand Down Expand Up @@ -75,6 +108,12 @@ spec:
items:
- key: broker-common.conf
path: broker-common.conf
- name: broker-acl-config
configMap:
name: broker-acl-config
items:
- key: plain_acl.yml
path: plain_acl.yml
# volumeClaimTemplates defines the storageClass
volumeClaimTemplates:
- metadata:
Expand Down
5 changes: 4 additions & 1 deletion pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ const (
// SubscriptionGroupJsonDir is the directory of subscriptionGroup.json
SubscriptionGroupJsonDir = StoreConfigDir + "/subscriptionGroup.json"

// BrokerConfigDir is the directory of the mounted config file
// BrokerConfigPath is the directory of the mounted config file
BrokerConfigPath = DataPath + "/rocketmq/broker/conf"

// BrokerPlainAclConfigName is the name of mounted acl config file
BrokerPlainAclConfigName = "plain_acl.yml"

// BrokerConfigName is the name of mounted configuration file
BrokerConfigName = "broker-common.conf"

Expand Down
47 changes: 34 additions & 13 deletions pkg/controller/broker/broker_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,19 +484,7 @@ func (r *ReconcileBroker) getBrokerStatefulSet(broker *rocketmqv1alpha1.Broker,
ContainerPort: cons.BrokerHighAvailabilityContainerPort,
Name: cons.BrokerHighAvailabilityContainerPortName,
}},
VolumeMounts: []corev1.VolumeMount{{
MountPath: cons.LogMountPath,
Name: broker.Spec.VolumeClaimTemplates[0].Name,
SubPath: cons.LogSubPathName + getPathSuffix(broker, brokerGroupIndex, replicaIndex),
}, {
MountPath: cons.StoreMountPath,
Name: broker.Spec.VolumeClaimTemplates[0].Name,
SubPath: cons.StoreSubPathName + getPathSuffix(broker, brokerGroupIndex, replicaIndex),
}, {
MountPath: cons.BrokerConfigPath + "/" + cons.BrokerConfigName,
Name: broker.Spec.Volumes[0].Name,
SubPath: cons.BrokerConfigName,
}},
VolumeMounts: getVolumeMounts(broker, brokerGroupIndex, replicaIndex),
}},
Volumes: getVolumes(broker),
SecurityContext: getPodSecurityContext(broker),
Expand All @@ -512,6 +500,39 @@ func (r *ReconcileBroker) getBrokerStatefulSet(broker *rocketmqv1alpha1.Broker,

}

func getVolumeMounts(broker *rocketmqv1alpha1.Broker, brokerGroupIndex int, replicaIndex int) []corev1.VolumeMount {
mounts := make([]corev1.VolumeMount, 0)

if len(broker.Spec.VolumeClaimTemplates) >= 1 {
mounts = append(mounts, corev1.VolumeMount{
MountPath: cons.LogMountPath,
Name: broker.Spec.VolumeClaimTemplates[0].Name,
SubPath: cons.LogSubPathName + getPathSuffix(broker, brokerGroupIndex, replicaIndex),
})
mounts = append(mounts, corev1.VolumeMount{
MountPath: cons.StoreMountPath,
Name: broker.Spec.VolumeClaimTemplates[0].Name,
SubPath: cons.StoreSubPathName + getPathSuffix(broker, brokerGroupIndex, replicaIndex),
})
}
if len(broker.Spec.Volumes) >= 1 {
mounts = append(mounts, corev1.VolumeMount{
MountPath: cons.BrokerConfigPath + "/" + cons.BrokerConfigName,
Name: broker.Spec.Volumes[0].Name,
SubPath: cons.BrokerConfigName,
})
}

if len(broker.Spec.Volumes) > 1 {
mounts = append(mounts, corev1.VolumeMount{
MountPath: cons.BrokerConfigPath + "/" + cons.BrokerPlainAclConfigName,
Name: broker.Spec.Volumes[1].Name,
SubPath: cons.BrokerPlainAclConfigName,
})
}
return mounts
}

func getENV(broker *rocketmqv1alpha1.Broker, replicaIndex int, brokerGroupIndex int) []corev1.EnvVar {
envs := []corev1.EnvVar{{
Name: cons.EnvNameServiceAddress,
Expand Down