extend argparser with tlskeyfile and tlscertfile

-update Dockerfile
-update bridge deployment script

Author: Helene

example_deployment_scripts/bridge_deployment/bridge-deployment.yaml

@@ -56,7 +56,11 @@ spec:
           - name: SERVER
             value: $(IBM_SPECTRUM_SCALE_PERF_QUERY_SERVICE_HOST)
           - name: TLSKEYPATH
-            value: /opt/registry/certs
+            value: /etc/bridge_ssl/certs
+          - name: TLSKEYFILE
+            value: "tls.key"
+          - name: TLSCERTFILE
+            value: "tls.crt"
           - name: PORT
             value: "8443"
           imagePullPolicy: Always
@@ -67,16 +71,17 @@ spec:
               containerPort: 8443
           volumeMounts:
             - name: logfiles
-              mountPath: /opt/IBM/bridge/logs
+              mountPath: /var/log/ibm_bridge_for_grafana/
             - name: config
               mountPath: /opt/IBM/zimon/
               readOnly: true
               optional: true
             - name: secret-volume
-              mountPath: /opt/registry/certs
+              mountPath: /etc/bridge_ssl/certs
+              type: DirectoryOrCreate
       initContainers:
       - name: init-scale-perf-query-service
-        image: busybox:1.28
+        image: busybox:latest
         command: ['sh', '-c', "until nslookup ibm-spectrum-scale-perf-query.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for ibm-spectrum-scale-perf-query service; sleep 2; done"]
       #######################################################################################################################
       #

source/Dockerfile

@@ -23,9 +23,16 @@ ARG HTTPPORT=4242
 ENV PORT=$HTTPPORT
 RUN echo "the HTTP/S port is set to $PORT" 
 
-ARG CERTPATH
+ARG CERTPATH=None
 ENV TLSKEYPATH=$CERTPATH
-RUN if [ -z "$TLSKEYPATH" ] && [ "$PORT" -eq 8443 ]; then echo "TLSKEYPATH FOR SSL CONNECTION NOT SET - ERROR"; exit 1; else echo "PASS"; fi
+
+ARG KEYFILE=None
+ENV TLSKEYFILE=$KEYFILE
+
+ARG CERTFILE=None
+ENV TLSCERTFILE=$CERTFILE
+
+RUN if [ -z "$TLSKEYPATH" ] || [ -z "$TLSCERTFILE" ] || [ -z "$TLSKEYFILE" ] && [ "$PORT" -eq 8443 ]; then echo "TLSKEYPATH FOR SSL CONNECTION NOT SET - ERROR"; exit 1; else echo "PASS"; fi
 RUN echo "the ssl certificates path is set to $TLSKEYPATH" 
 
 ARG PMCOLLECTORIP=0.0.0.0
@@ -35,7 +42,7 @@ RUN echo "the pmcollector server ip is set to $SERVER"
 
 WORKDIR /opt/IBM/bridge
 
-ARG DEFAULTLOGPATH='./logs/zserver.log'
+ARG DEFAULTLOGPATH='/var/log/ibm_bridge_for_grafanalogs/install.log'
 ENV LOGPATH=$DEFAULTLOGPATH
 RUN mkdir -p $(dirname $LOGPATH)
 RUN echo "the log will use $(dirname $LOGPATH)"
@@ -47,7 +54,7 @@ RUN echo "pmcollector_server: $SERVER" >> $LOGPATH
 RUN echo "ssl certificates location: $TLSKEYPATH" >> $LOGPATH
 RUN echo "HTTP/S port: $PORT" >> $LOGPATH
 
-CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -p $PORT -t $TLSKEYPATH"]
+CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -p $PORT -t $TLSKEYPATH --tlsKeyFile $TLSKEYFILE --tlsCertFile $TLSCERTFILE"]
 
 EXPOSE 4242 8443
 

source/confParser.py

@@ -100,9 +100,9 @@ def parse_cmd_args(argv):
     parser.add_argument('-f', '--logFile', action="store", default="zserver.log", help='Name of the log file (Default: zserver.log')
     parser.add_argument('-c', '--logLevel', action="store", type=int, default=logging.INFO, help='log level 10 (DEBUG), 20 (INFO), 30 (WARN), 40 (ERROR) (Default: 20)')
     parser.add_argument('-p', '--port', action="store", type=int, choices=[4242, 8443], default=4242, help='port number listening on for HTTP(S) connections (Default: 4242)')
-    parser.add_argument('-t', '--tlsKeyPath', action="store", help='Directory path of tls privkey.pem and cert.pem file location (Required only for HTTPS port 8443)')
-    parser.add_argument('-k', '--tlsKeyFile', action="store", help='Name of TLS key file, f.e.: privkey.pem (Required only for HTTPS port 8443)')
-    parser.add_argument('-m', '--tlsCertFile', action="store", help='Name of TLS certificate file, f.e.: cert.pem (Required only for HTTPS port 8443)')
+    parser.add_argument('-t', '--tlsKeyPath', action="store", default=None, help='Directory path of tls privkey.pem and cert.pem file location (Required only for HTTPS port 8443)')
+    parser.add_argument('-k', '--tlsKeyFile', action="store", default=None, help='Name of TLS key file, f.e.: privkey.pem (Required only for HTTPS port 8443)')
+    parser.add_argument('-m', '--tlsCertFile', action="store", default=None, help='Name of TLS certificate file, f.e.: cert.pem (Required only for HTTPS port 8443)')
 
     args = parser.parse_args(argv)
     return args, ''