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

Add options for ZK ACLs. #144

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Add options for ZK ACLs. #144

merged 1 commit into from
Nov 12, 2020

Conversation

HoustonPutman
Copy link
Contributor

@HoustonPutman HoustonPutman commented Sep 30, 2020

Issue number of the reported bug or feature request: Resolves #143

Describe your changes
Adding a section in the SolrCloud.Spec.zkRef.connectionInfo for specifying a secret that contains a username and password for ZK ACLs (both admin and read only).

// ZookeeperSpec defines the internal zookeeper ensemble to run for solr
type ZookeeperACL struct {
	// The name of the Kubernetes Secret that stores the username and password for the ACL.
	// This secret must be in the same namespace as the solrCloud is running in .
	SecretRef string `json:"secret"`

	// The name of the key in the given secret that contains the ACL username
	UsernameKey string `json:"usernameKey"`

	// The name of the key in the given secret that contains the ACL password
	PasswordKey string `json:"passwordKey"`
}

These ZK ACL options are also available for the Prometheus Exporter.

Testing performed
Unit tests have been added for injecting the ACLs. It has also been tested locally.

HoustonPutman added a commit to HoustonPutman/solr-operator that referenced this pull request Sep 30, 2020
HoustonPutman added a commit to HoustonPutman/solr-operator that referenced this pull request Oct 8, 2020
@HoustonPutman HoustonPutman changed the title Add options for ZK ACLs in SolrCloud CRD. Add options for ZK ACLs. Oct 8, 2020
HoustonPutman added a commit to HoustonPutman/solr-operator that referenced this pull request Oct 22, 2020
@HoustonPutman
Copy link
Contributor Author

Has unit tests, so the operator part is guaranteed to work. Also tested locally to make sure the solr and prometheus exporter params work correctly, as is expected.

@bsankara bsankara merged commit 30fa35b into apache:master Nov 12, 2020
@HoustonPutman HoustonPutman deleted the zk-acl branch November 13, 2020 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support Zookeeper ACLs
2 participants