Merge pull request #202 from memphisdev/latest

release 1.3.0
superstreamlabs · Nov 26, 2023 · 41a46b1 · 41a46b1
2 parents 62bd776 + abc8ecf
commit 41a46b1
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 53 deletions.
diff --git a/Jenkinsfile b/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
       """
     }

diff --git a/README.md b/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. | ""  | "&lt;JWT_TOKEN&gt;" |
 | memphis.creds.refreshJwtSecret | For internal traffic. Randomly generated. | ""  | "&lt;JWT_TOKEN&gt;" |
 | 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"` |

diff --git a/charts/index.yaml b/charts/index.yaml
@@ -1,12 +1,46 @@
 apiVersion: v1
 entries:
   memphis:
+  - annotations:
+      category: Streaming and messaging
+      licenses: Memphis Business Source License 1.0
+    apiVersion: v2
+    appVersion: 1.4.0
+    created: "2023-11-26T11:55:21.12373901Z"
+    dependencies:
+    - condition: metadata.enabled
+      name: metadata
+      repository: ""
+      version: 11.5.2
+    description: Memphis.dev Official Helm chart
+    digest: e1ba0a9bc147694908b1bc1e423f6748021d0e12be59f7fb15bab5e1fbc9c6bd
+    home: https://github.com/memphisdev/memphis
+    icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/icon.png
+    keywords:
+    - data streaming
+    - message broker
+    - memphis
+    - producer
+    - consumer
+    - cluster
+    - high availability
+    maintainers:
+    - name: Memphis.dev
+      url: https://k8s.memphis.dev/charts
+    name: memphis
+    sources:
+    - https://github.com/memphisdev/memphis
+    - https://www.memphis.dev
+    type: application
+    urls:
+    - https://k8s.memphis.dev/charts/memphis-1.3.0.tgz
+    version: 1.3.0
   - annotations:
       category: Streaming and messaging
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.3.1
-    created: "2023-11-06T13:14:43.498881698Z"
+    created: "2023-11-26T11:55:21.117921626Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -40,7 +74,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-11-06T13:14:43.493065977Z"
+    created: "2023-11-26T11:55:21.112847292Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -74,7 +108,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.2.0
-    created: "2023-11-06T13:14:43.487972612Z"
+    created: "2023-11-26T11:55:21.107215748Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -108,7 +142,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.2.0
-    created: "2023-11-06T13:14:43.482175174Z"
+    created: "2023-11-26T11:55:21.101696401Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -142,7 +176,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.2.0
-    created: "2023-11-06T13:14:43.47707803Z"
+    created: "2023-11-26T11:55:21.096669907Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -176,7 +210,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.1.1
-    created: "2023-11-06T13:14:43.471453214Z"
+    created: "2023-11-26T11:55:21.091100998Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -210,7 +244,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.1.0
-    created: "2023-11-06T13:14:43.466352622Z"
+    created: "2023-11-26T11:55:21.086142281Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -244,7 +278,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.3
-    created: "2023-11-06T13:14:43.4604757Z"
+    created: "2023-11-26T11:55:21.080376396Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -278,7 +312,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.1
-    created: "2023-11-06T13:14:43.455291461Z"
+    created: "2023-11-26T11:55:21.07538469Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -312,7 +346,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.0
-    created: "2023-11-06T13:14:43.449447077Z"
+    created: "2023-11-26T11:55:21.069833921Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -346,7 +380,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 0.4.5
-    created: "2023-11-06T13:14:43.444069429Z"
+    created: "2023-11-26T11:55:21.064624816Z"
     description: Memphis.dev Official Helm chart
     digest: e3e2ca1f38e7072aea1cbe9eeaf3c79c849289422e340960b56709056a1dea0f
     home: https://github.com/memphisdev/memphis
@@ -372,7 +406,7 @@ entries:
     version: 0.4.5
   - apiVersion: v2
     appVersion: 0.4.4
-    created: "2023-11-06T13:14:43.442538188Z"
+    created: "2023-11-26T11:55:21.062902542Z"
     description: Memphis.dev Helm chart
     digest: 6cf106e15fdfe86124e30afd91f036cd28d2a549fa01eba11bb08d35eb9c953e
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -383,7 +417,7 @@ entries:
     version: 0.4.4
   - apiVersion: v2
     appVersion: 0.4.3
-    created: "2023-11-06T13:14:43.44132592Z"
+    created: "2023-11-26T11:55:21.061739386Z"
     description: Memphis.dev Helm chart
     digest: be47621169bdd4942b954945ae97eb88041ae1220165aad628648dd7b9b3d7e7
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -394,7 +428,7 @@ entries:
     version: 0.4.3
   - apiVersion: v2
     appVersion: 0.4.2
-    created: "2023-11-06T13:14:43.440151977Z"
+    created: "2023-11-26T11:55:21.060595616Z"
     description: Memphis.dev Helm chart
     digest: 3a17890606d0eb961f17a88fc5a9d2258d2071745ba21d8864946a50ed7e3ebb
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -405,7 +439,7 @@ entries:
     version: 0.4.2
   - apiVersion: v2
     appVersion: 0.4.1
-    created: "2023-11-06T13:14:43.438940715Z"
+    created: "2023-11-26T11:55:21.059416873Z"
     description: Memphis.dev Helm chart
     digest: 3901e5059d04a93f2afef1e66f0f097610c4cf41ec8f85e030c3b4749a0b1c9b
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -416,7 +450,7 @@ entries:
     version: 0.4.1
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2023-11-06T13:14:43.437740902Z"
+    created: "2023-11-26T11:55:21.058272009Z"
     description: Memphis.dev Helm chart
     digest: abe8ef969af061633e0566bcc6f764a6175d74fe378d183a79394a3c4cf99b6b
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -427,7 +461,7 @@ entries:
     version: 0.4.0
   - apiVersion: v2
     appVersion: 0.3.6
-    created: "2023-11-06T13:14:43.436605024Z"
+    created: "2023-11-26T11:55:21.057155292Z"
     description: Memphis.dev Helm chart
     digest: 1463b0842ae745cfbc39bbbd59bf4aed1829610eb3305a5c9f0e8671fb9b433e
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -438,7 +472,7 @@ entries:
     version: 0.3.6
   - apiVersion: v2
     appVersion: 0.3.5
-    created: "2023-11-06T13:14:43.435444477Z"
+    created: "2023-11-26T11:55:21.055989928Z"
     description: Memphis.dev Helm chart
     digest: 9e05f5310f8456c431041b4e44f3570e4ae7d3bdab27d58f64c2486483951a2c
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -449,7 +483,7 @@ entries:
     version: 0.3.5
   - apiVersion: v2
     appVersion: 0.3.0
-    created: "2023-11-06T13:14:43.434214823Z"
+    created: "2023-11-26T11:55:21.054639646Z"
     description: A Helm chart for Kubernetes
     digest: df8bc3b91ffd995e9ee743c4814ce37b38ac55f9366d16a07eebf5f05a03d462
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -460,7 +494,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: 0.2.2
-    created: "2023-11-06T13:14:43.432393706Z"
+    created: "2023-11-26T11:55:21.052887341Z"
     description: A Helm chart for Kubernetes
     digest: d28563593f1577bb2381da7ec7a2b1a06301b04f30202ef00627127e21606657
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -471,7 +505,7 @@ entries:
     version: 0.2.2
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-11-06T13:14:43.431138469Z"
+    created: "2023-11-26T11:55:21.051669335Z"
     description: A Helm chart for Kubernetes
     digest: 28d3abb9dbc8bb4e5d98e319af96bee39d7079373bc6f3ea1459f057557f07a2
     name: memphis
@@ -481,12 +515,12 @@ entries:
     version: 0.2.1
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-11-06T13:14:43.429894662Z"
+    created: "2023-11-26T11:55:21.0504271Z"
     description: A Helm chart for Kubernetes
     digest: 8a6ec6bc3d6cdaed00455814cceac7ee4096268d08e82bc9ca0af4cdf3a65cf1
     name: memphis
     type: application
     urls:
     - https://k8s.memphis.dev/charts/memphis-0.2.0.tgz
     version: 0.2.0
-generated: "2023-11-06T13:14:43.428503329Z"
+generated: "2023-11-26T11:55:21.049172533Z"
diff --git a/charts/memphis-1.3.0.tgz b/charts/memphis-1.3.0.tgz
diff --git a/memphis/Chart.yaml b/memphis/Chart.yaml
@@ -30,8 +30,8 @@ sources:
   - https://github.com/memphisdev/memphis
   - https://www.memphis.dev
 
-version: 1.2.4
+version: 1.3.0
 
-appVersion: "1.3.1"
+appVersion: "1.4.0"
 
 icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/icon.png
diff --git a/memphis/templates/memphis_statefulset.yaml b/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/

diff --git a/memphis/values.yaml b/memphis/values.yaml
@@ -8,7 +8,7 @@ global:
   cluster:
     enabled: false
 memphis:
-  image: memphisos/memphis:1.3.1
+  image: memphisos/memphis:1.4.0
   pullPolicy: Always
   # This configures memphis UI port to default (9000)
   ui:
@@ -442,7 +442,7 @@ busybox:
 # Memphis REST Gateway configuration
 restGateway:
   enabled: true
-  image: memphisos/memphis-rest-gateway:1.2.3
+  image: memphisos/memphis-rest-gateway:1.2.4
   pullPolicy: Always
   user: root
   port: 4444

diff --git a/version.conf b/version.conf
@@ -1 +1 @@
-1.2.4
+1.3.0