Merge pull request #201 from memphisdev/master

release 1.3.0

Author: bkochauri-memphis

Jenkinsfile

@@ -62,8 +62,8 @@ node {
 
     stage('Install gh + jq') {
       sh """
-        sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-        sudo dnf install gh
+        sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo -y
+        sudo dnf install gh -y
         sudo dnf install jq -y
       """
     }

README.md

@@ -82,6 +82,7 @@ helm install memphis memphis/memphis --create-namespace --namespace memphis --wa
 | --- | --- | --- | --- |
 | global.cluster.enabled | Cluster mode for HA and Performance | `"false"` | `"false"` |
 | exporter.enabled | Prometheus exporter | `"false"` | `"false"` |
+| exporter.serviceExposed.enbaled | Expose metrics port with memphis service | `"false"` | `"true"` |
 | cluster.enabled | Enables Memphis cluster deployment. For fully HA configuration use global.cluster.enabled | `"false"` | `"true"` |
 | cluster.replicas | Memphis broker replicas | `"3"` | `"5"` |
 | memphis.image | Memphis image name | "memphisos/memphis:x.x.x-stable" | "memphisos/memphis:latest" |
@@ -99,15 +100,15 @@ helm install memphis memphis/memphis --create-namespace --namespace memphis --wa
 | memphis.creds.jwtSecret | For internal traffic. Randomly generated. | ""  | "<JWT_TOKEN>" |
 | memphis.creds.refreshJwtSecret | For internal traffic. Randomly generated. | ""  | "<JWT_TOKEN>" |
 | memphis.creds.encryptionSecretKey | Encryption secret key for internal encryption. Randomly generated. | ""  | ""  |
-| memphis.secretConfig.name | **\*Optional\***  <br>Name of the secret | "memphis-creds"  | "memphis-creds" |
-| memphis.secretConfig.existingSecret | **\*Optional\***  <br>Is this secret an existing secret | "false"  | "false" |
-| memphis.secretConfig.rootPwd_key | **\*Optional\***  <br>Name of the key in secret | "ROOT_PASSWORD"  | "rootPwd" |
-| memphis.secretConfig.connectionToken_key | **\*Optional\***  <br>Name of the key in secret | "CONNECTION_TOKEN"  | "connectionToken" |
-| memphis.secretConfig.jwtSecret_key | **\*Optional\***  <br>Name of the key in secret | "JWT_SECRET"  | "jwtSecret" |
-| memphis.secretConfig.refreshJwtSecret_key | **\*Optional\***  <br>Name of the key in secret | "REFRESH_JWT_SECRET"  | "refreshJwtSecret" |
-| memphis.secretConfig.encryptionSecretKey_key | **\*Optional\***  <br>Name of the key in secret | "ENCRYPTION_SECRET_KEY"  | "encryptionSecretKey" |
-| memphis.secretConfig.refreshJwtSecretRestGW_key | **\*Optional\***  <br>Name of the key in secret | "REFRESH_JWT_SECRET_REST_GW"  | "refreshJwtSecretRestGW" |
-| memphis.secretConfig.jwtSecretRestGW_key | **\*Optional\***  <br>Name of the key in secret | "JWT_SECRET_REST_GW"  | "jwtSecretRestGW" |
+| memphis.creds.secretConfig.name | **\*Optional\***  <br>Name of the secret | "memphis-creds"  | "memphis-creds" |
+| memphis.creds.secretConfig.existingSecret | **\*Optional\***  <br>Is this secret an existing secret | "false"  | "false" |
+| memphis.creds.secretConfig.rootPwd_key | **\*Optional\***  <br>Name of the key in secret | "ROOT_PASSWORD"  | "rootPwd" |
+| memphis.creds.secretConfig.connectionToken_key | **\*Optional\***  <br>Name of the key in secret | "CONNECTION_TOKEN"  | "connectionToken" |
+| memphis.creds.secretConfig.jwtSecret_key | **\*Optional\***  <br>Name of the key in secret | "JWT_SECRET"  | "jwtSecret" |
+| memphis.creds.secretConfig.refreshJwtSecret_key | **\*Optional\***  <br>Name of the key in secret | "REFRESH_JWT_SECRET"  | "refreshJwtSecret" |
+| memphis.creds.secretConfig.encryptionSecretKey_key | **\*Optional\***  <br>Name of the key in secret | "ENCRYPTION_SECRET_KEY"  | "encryptionSecretKey" |
+| memphis.creds.secretConfig.refreshJwtSecretRestGW_key | **\*Optional\***  <br>Name of the key in secret | "REFRESH_JWT_SECRET_REST_GW"  | "refreshJwtSecretRestGW" |
+| memphis.creds.secretConfig.jwtSecretRestGW_key | **\*Optional\***  <br>Name of the key in secret | "JWT_SECRET_REST_GW"  | "jwtSecretRestGW" |
 | memphis.extraEnvironmentVars.enabled | **\*Optional\***  <br>List of additional environment variables for memphis. | ""  | vars:  <br>\- name: KEY  <br>\- valye: value |
 | memphis.tls.verify | **\*Optional\***  <br>For encrypted client-memphis communication. Verification for the CA autority. SSL. | ""  | `"true"` |
 | memphis.tls.secret.name | **\*Optional\***  <br>For encrypted client-memphis communication.  <br>K8S secret name that holds the certs. SSL. | ""  | `"memphis-client-tls-secret"` |

memphis/templates/memphis_statefulset.yaml

@@ -529,25 +529,25 @@ spec:
 
         {{- end }}
 
-        # Gracefully stop NATS Server on pod deletion or image upgrade.
+        # Gracefully stop Memphis Server on pod deletion or image upgrade.
         #
         lifecycle:
           preStop:
             exec:
-              # Using the alpine based NATS image, we add an extra sleep that is
+              # Using the alpine based Memphis image, we add an extra sleep that is
               # the same amount as the terminationGracePeriodSeconds to allow
-              # the NATS Server to gracefully terminate the client connections.
+              # the Memphis Server to gracefully terminate the client connections.
               #
               command:
               - "/bin/sh"
               - "-c"
               - "nats-server -sl=ldm=/var/run/memphis/memphis.pid"
 
-      #################################
-      #                               #
-      #  NATS Configuration Reloader  #
-      #                               #
-      #################################
+      ####################################
+      #                                  #
+      #  Memphis Configuration Reloader  #
+      #                                  #
+      ####################################
       {{ if .Values.reloader.enabled }}
       - name: reloader
         image: {{ .Values.reloader.image }}
@@ -578,11 +578,11 @@ spec:
           {{- end }}
       {{ end }}
 
-      ##############################
-      #                            #
-      #  NATS Prometheus Exporter  #
-      #                            #
-      ##############################
+      #################################
+      #                               #
+      #  Memphis Prometheus Exporter  #
+      #                               #
+      #################################
       {{ if .Values.exporter.enabled }}
       - name: metrics
         image: {{ .Values.exporter.image }}
@@ -598,7 +598,7 @@ spec:
         - -routez
         - -subz
         - -varz
-        - -prefix=nats
+        - -prefix=memphis
         - -use_internal_server_id
         - -jsz=all
         - http://localhost:8222/

version.conf

@@ -1 +1 @@
-1.2.4
+1.3.0