diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-04-02 10:02:05 +0200 |
---|---|---|
committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-04-08 18:54:09 +0200 |
commit | a3854762a4d22de46cb56c52a5d9c401dfad6680 (patch) | |
tree | 43df97edc450efa37b7338d44a5a2eb3db42b845 /kubernetes/holmes | |
parent | 51a3229247fe40fcc5bd63bd3b673e216b6e37ee (diff) |
[GLOBAL] Don't try to set keypassword when storetype is PKCS12
It seems that for PKCS12 stores there is no keypassword so we are
getting this error in our logs:
keytool error: java.lang.UnsupportedOperationException:
-keypasswd commands not supported if -storetype is PKCS12
Let's fix this by just not trying to set key password for PKCS12 stores.
Issue-ID: OOM-1
Change-Id: I8f4cc5a0b54029b3c1baa83b61092942e34ffab2
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Diffstat (limited to 'kubernetes/holmes')
-rw-r--r-- | kubernetes/holmes/components/holmes-engine-mgmt/values.yaml | 5 | ||||
-rw-r--r-- | kubernetes/holmes/components/holmes-rule-mgmt/values.yaml | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml index f27f4bac79..f44faa1059 100644 --- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml +++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml @@ -55,11 +55,6 @@ certInitializer: keytool -storepasswd -new "${TRUSTSORE_PASSWORD}" \ -storepass "${cadi_truststore_password}" \ -keystore {{ .Values.fqi_namespace }}.trust.jks - echo "*** set key password as same password as keystore password" - keytool -keypasswd -new "${KEYSTORE_PASSWORD}" \ - -keystore {{ .Values.fqi_namespace }}.p12 \ - -keypass "${cadi_keystore_password_p12}" \ - -storepass "${KEYSTORE_PASSWORD}" -alias {{ .Values.fqi }} echo "*** save the generated passwords" echo "KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}" > mycreds.prop echo "TRUSTSORE_PASSWORD=${TRUSTSORE_PASSWORD}" >> mycreds.prop diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml index 91998f3809..9e2b656150 100644 --- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml +++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml @@ -55,11 +55,6 @@ certInitializer: keytool -storepasswd -new "${TRUSTSORE_PASSWORD}" \ -storepass "${cadi_truststore_password}" \ -keystore {{ .Values.fqi_namespace }}.trust.jks - echo "*** set key password as same password as keystore password" - keytool -keypasswd -new "${KEYSTORE_PASSWORD}" \ - -keystore {{ .Values.fqi_namespace }}.p12 \ - -keypass "${cadi_keystore_password_p12}" \ - -storepass "${KEYSTORE_PASSWORD}" -alias {{ .Values.fqi }} echo "*** save the generated passwords" echo "KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}" > mycreds.prop echo "TRUSTSORE_PASSWORD=${TRUSTSORE_PASSWORD}" >> mycreds.prop |