-
Notifications
You must be signed in to change notification settings - Fork 207
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
US-624029 : SSL and NIST SP 800-53 and NIST SP 800-131 support for Clustering Service #794
Merged
Merged
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
34bc100
US-624029 : HZ SSL and NIST SP 800-53 and NIST SP 800-131 support
765be0f
US-624029 : HZ SSL and NIST SP 800-53 and NIST SP 800-131 support
d7ea632
US-624029 : doc updated
81479b3
US-624029 : HZ SSL and NIST SP 800-53 and NIST SP 800-131 support
ab9272d
Merge branch 'pegasystems:master' into US-624029
vnihal72 3325306
Merge branch 'master' into US-624029
vnihal72 657fafa
US-624029: Addressing review comments
Pushpendrak18 e7abad6
US-624029: Addressing review comments
Pushpendrak18 7e7d51a
US-624029: Addressing review comments
Pushpendrak18 563a518
US-624029: fixing failing tests
Pushpendrak18 4621b83
US-624029: Addressing review comments
Pushpendrak18 057ea7e
US-624029: Addressing review comments
Pushpendrak18 07604aa
Merge branch 'master' into US-624029
kishorv10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
default: secrets | ||
|
||
NAMESPACE := <YOUR_NAMESPACE> | ||
CLUSTERING_SERVICE_IMAGE := <CLUSTERING_SERVICE_IMAGE> | ||
ENC_KEYSTORE_PASSWORD := <ENC_KEYSTORE_PASSWORD> | ||
ENC_TRUSTSTORE_PASSWORD := <ENC_TRUSTSTORE_PASSWORD> | ||
HIGHLY_SECURED_CRYPTO_MODE_ENABLED := <HIGHLY_SECURED_CRYPTO_MODE_ENABLED> | ||
ALIAS := myalias | ||
|
||
ifeq ($(HIGHLY_SECURED_CRYPTO_MODE_ENABLED), true) | ||
secrets: | ||
docker run --name hazelcast-helm-charts-certs -i -w /tmp \ | ||
$(CLUSTERING_SERVICE_IMAGE) \ | ||
/bin/sh -c " \ | ||
./certs.sh HIGHLY_SECURED_CRYPTO_MODE_ENABLED $(ENC_KEYSTORE_PASSWORD) cluster-keystore $(ENC_TRUSTSTORE_PASSWORD) cluster-truststore $(ALIAS)" &&\ | ||
docker cp hazelcast-helm-charts-certs:/tmp/cluster-keystore.jks ./ &&\ | ||
docker cp hazelcast-helm-charts-certs:/tmp/cluster-truststore.jks ./ &&\ | ||
docker rm -f hazelcast-helm-charts-certs &&\ | ||
kubectl create secret generic hz-encryption-secrets --from-literal=HZ_SSL_KEYSTORE_PASSWORD=$(ENC_KEYSTORE_PASSWORD) --from-literal=HZ_SSL_TRUSTSTORE_PASSWORD=$(ENC_TRUSTSTORE_PASSWORD) --from-file=cluster-keystore.jks --from-file=cluster-truststore.jks --namespace=$(NAMESPACE) | ||
else | ||
secrets: | ||
docker run --name hazelcast-helm-charts-certs -i -w /tmp \ | ||
$(CLUSTERING_SERVICE_IMAGE) \ | ||
/bin/sh -c " \ | ||
./certs.sh SSL_MODE_ENABLED $(ENC_KEYSTORE_PASSWORD) cluster-keystore $(ENC_TRUSTSTORE_PASSWORD) cluster-truststore $(ALIAS)" && \ | ||
docker cp hazelcast-helm-charts-certs:/tmp/cluster-keystore.jks ./ &&\ | ||
docker cp hazelcast-helm-charts-certs:/tmp/cluster-truststore.jks ./ &&\ | ||
docker rm -f hazelcast-helm-charts-certs &&\ | ||
kubectl create secret generic hz-encryption-secrets --from-literal=HZ_SSL_KEYSTORE_PASSWORD=$(ENC_KEYSTORE_PASSWORD) --from-literal=HZ_SSL_TRUSTSTORE_PASSWORD=$(ENC_TRUSTSTORE_PASSWORD) --from-file=cluster-keystore.jks --from-file=cluster-truststore.jks --namespace=$(NAMESPACE) | ||
|
||
endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,6 +77,12 @@ spec: | |
# Used to specify permissions on files within the volume. | ||
defaultMode: 420 | ||
{{- include "pegaCredentialVolumeTemplate" .root | indent 6 }} | ||
{{- if (.root.Values.hazelcast.encryption.enabled) }} | ||
- name: hz-encryption-secrets | ||
secret: | ||
defaultMode: 444 | ||
secretName: hz-encryption-secrets | ||
{{- end }} | ||
{{ if or (.root.Values.global.certificates) (.root.Values.global.certificatesSecrets) }} | ||
{{- include "pegaImportCertificatesTemplate" .root | indent 6 }} | ||
{{ end }} | ||
|
@@ -289,6 +295,10 @@ spec: | |
- name: {{ template "pegaKerberosConfig" }}-config | ||
mountPath: "/opt/pega/kerberos" | ||
{{- end }} | ||
{{- if (.root.Values.hazelcast.encryption.enabled) }} | ||
- name: hz-encryption-secrets | ||
mountPath: "/opt/hazelcast/certs" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I assume this path is available in HZ image. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes @Saurabh-16 |
||
{{- end }} | ||
|
||
# LivenessProbe: indicates whether the container is live, i.e. running. | ||
livenessProbe: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When is this file invoked? Can this file be put within HZ subcharts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file will be invoked manually, please refer: https://github.com/pegasystems/pega-helm-charts/pull/794/files#diff-346646b74f5caaa4e6ffacf9785c6718623b85624c4ad9bd81b6b4496b4d4eb2R1282
This file will generate common certificate for clustering-service and platform, so we are putting it in pega chart