Merge "Remove helm charts from CertService"

16 files changed, 1 insertions, 228 deletions

diff --git a/README.md b/README.md
index 2db3abf5..2523995a 100644
--- a/README.md
+++ b/README.md
@@ -53,13 +53,6 @@ make stop-client
 4. Stop Cert Service and EJBCA
 make stop-backend
 ```
-    
-### Running API with Helm
-1. Use environment/server with installed kubernetes and helm.
-2. Copy certService/helm/aaf-cert-service directory to that environment.
-3. Enter that environment 
-4. Run ```helm install ./aaf-cert-service```
-
 
 ### AAF CertService CSITs
 #### CSIT repository
diff --git a/certService/helm/aaf-cert-service/.helmignore b/certService/helm/aaf-cert-service/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/certService/helm/aaf-cert-service/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/certService/helm/aaf-cert-service/Chart.yaml b/certService/helm/aaf-cert-service/Chart.yaml
deleted file mode 100644
index 37c7d148..00000000
--- a/certService/helm/aaf-cert-service/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for AAF Cert Service
-name: aaf-cert-service
-version: 0.1.0
diff --git a/certService/helm/aaf-cert-service/resources/certServiceClient-keystore.jks b/certService/helm/aaf-cert-service/resources/certServiceClient-keystore.jks
deleted file mode 100644
index f24908c5..00000000
--- a/certService/helm/aaf-cert-service/resources/certServiceClient-keystore.jks
+++ /dev/null
diff --git a/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.jks b/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.jks
deleted file mode 100644
index 89605b6b..00000000
--- a/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.jks
+++ /dev/null
diff --git a/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.p12 b/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.p12
deleted file mode 100644
index 2106c817..00000000
--- a/certService/helm/aaf-cert-service/resources/certServiceServer-keystore.p12
+++ /dev/null
diff --git a/certService/helm/aaf-cert-service/resources/root.crt b/certService/helm/aaf-cert-service/resources/root.crt
deleted file mode 100644
index faeee813..00000000
--- a/certService/helm/aaf-cert-service/resources/root.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFlDCCA3ygAwIBAgIETsAy8jANBgkqhkiG9w0BAQwFADByMQswCQYDVQQGEwJQ

-TDEUMBIGA1UECBMLRG9sbnkgU2xhc2sxEDAOBgNVBAcTB1dyb2NsYXcxFTATBgNV

-BAoTDFJvb3QgQ29tcGFueTERMA8GA1UECxMIUm9vdCBPcmcxETAPBgNVBAMTCHJv

-b3QuY29tMB4XDTIwMDQwMzA5MTYxNloXDTMwMDQwMTA5MTYxNlowcjELMAkGA1UE

-BhMCUEwxFDASBgNVBAgTC0RvbG55IFNsYXNrMRAwDgYDVQQHEwdXcm9jbGF3MRUw

-EwYDVQQKEwxSb290IENvbXBhbnkxETAPBgNVBAsTCFJvb3QgT3JnMREwDwYDVQQD

-Ewhyb290LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAImm68wu

-rtdkVrC5JI2y53+DoVE4al7NxC2yHeVW0PRD3CgW1xba6dlSQoDQQKkDkxtuNhlU

-IQxU1bbKR6syqJgpJXwSDx4sl4J5lQGWN+iuNA72C1IyXATOgowGq6PbOVVTkApy

-3+ZZGBCmweTjhvddAO7k5p8v+ePt17VvBTxSt6rSvrkGMbpCxBGAPfGpL9xykm9Z

-okVSlA42gGhbra499QTT0Yc/WPPFotKkDKFGaDrLW3NYX1Lio11myYNvLOMwfSEV

-Xy9vkwxcdqFJpHjx+EVLLQXwkudZP+D53N4bk8nP3SacbZSQ/A85mZpWNtw+r9QL

-fZGecY1YIR0udLj66CIG3ybl3gSXX7TSRERTIMR6Um1lt+039FSa18mRBpQTCDXV

-tSL58Qs5BHFkCe0sGpY+XiSEypc6oYPf/7YjiTvMT/mHhDffrvFjhK+wP/oCIg8u

-vuPRoPWuyw41bBeFGitJgDn7E8p9B4K/1DCO/ZcjXiYMgn5Hwb3ojablYUeiXs99

-2AAV8gCceUCdgcP8d6wdAydOVljavkgHPG0IMbiVG1WT57oM3HQpejgpujlKDDsI

-bi9/lbcC/U0JoN9yAaJZFr7CXJrxRv8DWeTwzMTo203KHNu9roQiERd38P8Dp6AQ

-ivmqf0+0VZM3IpjWBYKM68tclHJcG+7wyFjvAgMBAAGjMjAwMB0GA1UdDgQWBBSN

-lFyR56zh67mnvYTmmgJQVxEJrjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB

-DAUAA4ICAQBczmFY0kmr1FK50glkT282ur0vukNtwXQNJONof3rYRqP2W98jID6D

-ayma0B4/H1EqCa0d66wRBxFdwW+MqOc4uWD3uUwgazrYD/Bv+V3aumaw8yX6vbyL

-hLNfpd4pViAEGtzYxYfMfFR6uzInF3NMpvt8OXCSGKiQjDMnMs0ekvUZLJm7yxwT

-Qr9aAEFYQYM/GstUC6qFfuUa4MaGvmyKWhZ10JoKXYbGGeFU4wI7Kzifh3VvawTg

-r314ZvQ3zpEwzNJpdvT5ZKuPvyN+drAKFpSPfOTFmmb3uF95FgYq33OFPpo7SR43

-tnw5u5YqKnsHmqCIRMctWiYZc8rBJ3+eBGmke6z/AN6FraG6Ejc8e4WPclrB8STb

-+oB3a4Cvri1VHyodkm50Sb/d1FAMDXvzEPBfu2D0dVvOwOcISSN/MQUom8NN4YeI

-aEATdAPNkokgehOzZ1OPRv47FKYEVPCXjaZEWAC7NNmNiRn4RQOti0DlNrLL7Nx9

-vK09G0EnW01MO2ARRkZ3dog+Ph7orJQV3sd7TO4EEortqWtbegSH75ylyYw6rt/j

-uBzYtMOnEtnQKhxj4Wj7PO+StCgspoOByn0d+iSgDd2TlpWm4naP2pfFZT0R+TOH

-wzSH0F47TSfRd0++uEz/QhViybrvQK7yMt1G1YwZp2im+imuWwUC8Q==
------END CERTIFICATE-----
diff --git a/certService/helm/aaf-cert-service/resources/truststore.jks b/certService/helm/aaf-cert-service/resources/truststore.jks
deleted file mode 100644
index c32d37fd..00000000
--- a/certService/helm/aaf-cert-service/resources/truststore.jks
+++ /dev/null
diff --git a/certService/helm/aaf-cert-service/templates/deployment.yaml b/certService/helm/aaf-cert-service/templates/deployment.yaml
deleted file mode 100644
index f4a28f46..00000000
--- a/certService/helm/aaf-cert-service/templates/deployment.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Chart.Name }}-deployment
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Values.appLabel }}
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.appLabel }}
-    spec:
-      volumes:
-      - name: {{ .Values.volume.name }}
-        secret:
-          secretName: {{ .Values.secret.name }}
-      - name: {{ .Values.tls.server.volume.name }}
-        secret:
-          secretName: {{ .Values.tls.server.secret.name }}
-      containers:
-      - name: aaf-cert-service
-        image: {{ .Values.repository }}/{{ .Values.image }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.containerPort }}
-        env:
-          - name: HTTPS_PORT
-            value: "{{ .Values.containerPort }}"
-          - name: KEYSTORE_PATH
-            value: "{{ .Values.tls.server.volume.mountPath }}/{{ .Values.envs.keystore.jksName }}"
-          - name: KEYSTORE_P12_PATH
-            value: "{{ .Values.tls.server.volume.mountPath }}/{{ .Values.envs.keystore.p12Name }}"
-          - name: TRUSTSTORE_PATH
-            value: "{{ .Values.tls.server.volume.mountPath }}/{{ .Values.envs.truststore.jksName }}"
-          - name: ROOT_CERT
-            value: "{{ .Values.tls.server.volume.mountPath }}/{{ .Values.envs.truststore.crtName }}"
-          - name: KEYSTORE_PASSWORD
-            value: "{{ .Values.envs.keystore.password }}"
-          - name: TRUSTSTORE_PASSWORD
-            value: "{{ .Values.envs.truststore.password }}"
-        livenessProbe:
-          exec:
-            command:
-              - /bin/bash
-              - -c
-              - {{ .Values.liveness.command }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-        readinessProbe:
-          exec:
-            command:
-              - /bin/bash
-              - -c
-              - {{ .Values.readiness.command }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readiness.periodSeconds }}
-        volumeMounts:
-        - name: {{ .Values.volume.name }}
-          mountPath: {{ .Values.volume.mountPath }}
-          readOnly: true
-        - name: {{ .Values.tls.server.volume.name }}
-          mountPath: {{ .Values.tls.server.volume.mountPath }}
-          readOnly: true
-        resources:
-          {{ toYaml .Values.resources }}
diff --git a/certService/helm/aaf-cert-service/templates/secret.yaml b/certService/helm/aaf-cert-service/templates/secret.yaml
deleted file mode 100644
index 77b25f4e..00000000
--- a/certService/helm/aaf-cert-service/templates/secret.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.secret.name }}
-type: Opaque
-data:
-  {{ (.Files.Glob "resources/cmpServers.json").AsSecrets }}
\ No newline at end of file
diff --git a/certService/helm/aaf-cert-service/templates/secret_client_tls.yaml b/certService/helm/aaf-cert-service/templates/secret_client_tls.yaml
deleted file mode 100644
index b80a4af4..00000000
--- a/certService/helm/aaf-cert-service/templates/secret_client_tls.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.tls.client.secret.name }}
-type: Opaque
-data:
-  certServiceClient-keystore.jks:
-  {{ (.Files.Glob "resources/certServiceClient-keystore.jks").AsSecrets }}
-  truststore.jks:
-  {{ (.Files.Glob "resources/truststore.jks").AsSecrets }}
diff --git a/certService/helm/aaf-cert-service/templates/secret_server_tls.yaml b/certService/helm/aaf-cert-service/templates/secret_server_tls.yaml
deleted file mode 100644
index 535e3dbd..00000000
--- a/certService/helm/aaf-cert-service/templates/secret_server_tls.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.tls.server.secret.name }}
-type: Opaque
-data:
-  certServiceServer-keystore.jks:
-  {{ (.Files.Glob "resources/certServiceServer-keystore.jks").AsSecrets }}
-  certServiceServer-keystore.p12:
-  {{ (.Files.Glob "resources/certServiceServer-keystore.p12").AsSecrets }}
-  truststore.jks:
-  {{ (.Files.Glob "resources/truststore.jks").AsSecrets }}
-  root.crt:
-  {{ (.Files.Glob "resources/root.crt").AsSecrets }}
\ No newline at end of file
diff --git a/certService/helm/aaf-cert-service/templates/service.yaml b/certService/helm/aaf-cert-service/templates/service.yaml
deleted file mode 100644
index f3c0ee0c..00000000
--- a/certService/helm/aaf-cert-service/templates/service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    app: {{ .Values.appLabel }}
-  ports:
-    - protocol: TCP
-      port: {{ .Values.containerPort }}
\ No newline at end of file
diff --git a/certService/helm/aaf-cert-service/values.yaml b/certService/helm/aaf-cert-service/values.yaml
deleted file mode 100644
index efb16a5a..00000000
--- a/certService/helm/aaf-cert-service/values.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-appLabel: aaf-cert-service
-replicaCount: 1
-repository: nexus3.onap.org:10001
-image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0
-pullPolicy: Always
-containerPort: 8443
-service:
-  type: ClusterIP
-liveness:
-  initialDelaySeconds: 60
-  periodSeconds: 10
-  command: curl https://localhost:$HTTPS_PORT/actuator/health --cacert $ROOT_CERT --cert-type p12 --cert $KEYSTORE_P12_PATH --pass $KEYSTORE_PASSWORD
-readiness:
-  initialDelaySeconds: 30
-  periodSeconds: 10
-  command: curl https://localhost:$HTTPS_PORT/ready --cacert $ROOT_CERT --cert-type p12 --cert $KEYSTORE_P12_PATH --pass $KEYSTORE_PASSWORD
-volume:
-  name: aaf-cert-service-volume
-  mountPath: /etc/onap/aaf/certservice
-
-resources:
-  limits:
-    cpu: 2
-    memory: 2Gi
-  requests:
-    cpu: 1
-    memory: 1Gi
-
-secret:
-  name: aaf-cert-service-secret
-
-tls:
-  server:
-    secret:
-      name: aaf-cert-service-server-tls-secret
-    volume:
-      name: aaf-cert-service-server-tls-volume
-      mountPath: /etc/onap/aaf/certservice/certs/
-  client:
-    secret:
-      name: aaf-cert-service-client-tls-secret
-
-envs:
-  keystore:
-    jksName: certServiceServer-keystore.jks
-    p12Name: certServiceServer-keystore.p12
-    password: secret
-  truststore:
-    jksName: truststore.jks
-    crtName: root.crt
-    password: secret
-
diff --git a/certService/helm/aaf-cert-service/resources/cmpServers.json b/compose-resources/cmpServers.json
index d6557c52..d6557c52 100644
--- a/certService/helm/aaf-cert-service/resources/cmpServers.json
+++ b/compose-resources/cmpServers.json
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ce8ed48..8aa72a55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
   aaf-cert-service:
     image: onap/org.onap.aaf.certservice.aaf-certservice-api:latest
     volumes:
-      - ./certService/helm/aaf-cert-service/resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
+      - ./compose-resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
       - ./certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks
       - ./certs/root.crt:/etc/onap/aaf/certservice/certs/root.crt
       - ./certs/certServiceServer-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks