OZG-4453 fix certificate mounts

ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml

@@ -93,7 +93,7 @@ spec:
           subPath: type
           readOnly: true
         - name: elasticsearch-certificate
-          mountPath: "/bindings/ca-certificates/elasticsearch-certificate.pem"
+          mountPath: "/bindings/ca-certificates/es-root-ca.pem"
           subPath: ca.crt
           readOnly: true
       volumes:

ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml

@@ -32,6 +32,7 @@ rules:
       - ""
     resourceNames:
       - {{ required "elasticsearch.adminSecretName must be set" (.Values.elasticsearch).adminSecretName }}
+      - {{ required "elasticsearch.certificateSecretName must be set" (.Values.elasticsearch).certificateSecretName }}
     resources:
       - secrets
     verbs:

ozgcloud-elasticsearch-operator/src/main/helm/values.yaml

@@ -5,3 +5,4 @@ image:
 elasticsearch:
     namespace: elastic-system
     adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-ozg-search-es-transport-certs

ozgcloud-elasticsearch-operator/src/main/resources/application.yml

@@ -9,8 +9,8 @@ ozgcloud:
       host: ozg-search-cluster-es-http.${ozgcloud.elasticsearch.server.namespace}
       port: 9200
       scheme: https
-      certificateNamespace: ozgcloud-elasticsearch-operator
-      certificateSecretName: elasticsearch-certificate
+      certificateNamespace: elastic-system
+      certificateSecretName: ozg-search-cluster-es-ozg-search-es-transport-certs
       certificateSecretDataKey: ca.crt
 
 management:

ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml

@@ -81,6 +81,6 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts
           content:  
               name: elasticsearch-certificate
-              mountPath: "/bindings/ca-certificates/elasticsearch-certificate.pem"
+              mountPath: "/bindings/ca-certificates/es-root-ca.pem"
               subPath: ca.crt
               readOnly: true
\ No newline at end of file

ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml

@@ -60,6 +60,7 @@ tests:
                 - ""
               resourceNames:
                 - ozg-search-cluster-es-elastic-user
+                - ozg-search-cluster-es-ozg-search-es-transport-certs
               resources:
                 - secrets
               verbs: