Merge pull request #196 from memphisdev/latest

Release 1.2.4
superstreamlabs · Nov 6, 2023 · 62bd776 · 62bd776
2 parents c7a8d61 + df86920
commit 62bd776
Show file tree

Hide file tree

Showing 14 changed files with 221 additions and 159 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -62,9 +62,9 @@ node {
 
     stage('Install gh + jq') {
       sh """
-        sudo yum-config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-        sudo yum install gh -y
-        sudo yum install jq -y
+        sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
+        sudo dnf install gh
+        sudo dnf install jq -y
       """
     }
     stage('Push to latest'){

diff --git a/README.md b/README.md
@@ -1,45 +1,29 @@
-<div align="center">
-
-  ![Banner- Memphis dev streaming  (2)](https://github.com/memphisdev/memphis-k8s/assets/107035359/ab72eb91-2589-4c2b-aa54-3bc1b120bcac)
-
-
-</div>
+<a href="![Github (2)](https://github.com/memphisdev/memphis.js/assets/107035359/731a59be-0f46-4a94-84c3-c0b2a07fe01c)">![Github (2)](https://github.com/memphisdev/memphis.js/assets/107035359/281222f9-8f93-4a20-9de8-7c26541bded7)</a>
+<p align="center">
+<a href="https://memphis.dev/discord"><img src="https://img.shields.io/discord/963333392844328961?color=6557ff&label=discord" alt="Discord"></a>
+<a href="https://github.com/memphisdev/memphis/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/memphisdev/memphis?color=6557ff"></a> 
+  <img src="https://img.shields.io/npm/dw/memphis-dev?color=ffc633&label=installations">
+<a href="https://github.com/memphisdev/memphis/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/Code%20of%20Conduct-v1.0-ff69b4.svg?color=ffc633" alt="Code Of Conduct"></a> 
+<img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/memphisdev/memphis?color=61dfc6">
+<img src="https://img.shields.io/github/last-commit/memphisdev/memphis?color=61dfc6&label=last%20commit">
+</p>
 
 <div align="center">
+
+  <img width="200" alt="CNCF Silver Member" src="https://github.com/cncf/artwork/raw/master/other/cncf-member/silver/color/cncf-member-silver-color.svg#gh-light-mode-only">
+  <img width="200" alt="CNCF Silver Member" src="https://github.com/cncf/artwork/raw/master/other/cncf-member/silver/white/cncf-member-silver-white.svg#gh-dark-mode-only">
+
 
   <h4>
 
-**[Memphis](https://memphis.dev)** is an intelligent, frictionless message broker.<br>Made to enable developers to build real-time and streaming apps fast.
+**[Memphis.dev](https://memphis.dev)** is a highly scalable, painless, and effortless data streaming platform.<br>
+Made to enable developers and data teams to collaborate and build<br>
+real-time and streaming apps fast.
 
   </h4>
 
-  <a href="https://landscape.cncf.io/?selected=memphis"><img width="200" alt="CNCF Silver Member" src="https://github.com/cncf/artwork/raw/master/other/cncf-member/silver/white/cncf-member-silver-white.svg#gh-dark-mode-only"></a>
-
 </div>
 
-<div align="center">
-
-  <img width="200" alt="CNCF Silver Member" src="https://github.com/cncf/artwork/raw/master/other/cncf-member/silver/color/cncf-member-silver-color.svg#gh-light-mode-only">
-
-</div>
-
- <p align="center">
-  <a href="https://memphis.dev/pricing/">Cloud - </a><a href="https://memphis.dev/docs/">Docs</a> - <a href="https://twitter.com/Memphis_Dev">Twitter</a> - <a href="https://www.youtube.com/channel/UCVdMDLCSxXOqtgrBaRUHKKg">YouTube</a>
-</p>
-
-<p align="center">
-<a href="https://discord.gg/WZpysvAeTf"><img src="https://img.shields.io/discord/963333392844328961?color=6557ff&label=discord" alt="Discord"></a>
-<a href="https://github.com/memphisdev/memphis/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/memphisdev/memphis?color=6557ff"></a> 
-  <img src="https://img.shields.io/npm/dw/memphis-dev?color=ffc633&label=installations">
-<a href="https://github.com/memphisdev/memphis/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/Code%20of%20Conduct-v1.0-ff69b4.svg?color=ffc633" alt="Code Of Conduct"></a> 
-<img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/memphisdev/memphis?color=61dfc6">
-<img src="https://img.shields.io/github/last-commit/memphisdev/memphis?color=61dfc6&label=last%20commit">
-</p>
-
-Memphis.dev is more than a broker. It's a new streaming stack.<br><br>
-It significantly accelerates the development of real-time applications that require a streaming platform with<br>
-high throughput, low latency, easy troubleshooting, fast time-to-value,<br>minimal platform operations, and all the observability you can think of.<br>
-
 # Memphis Kubernetes Deployment
 
 Helm is a k8s package manager that allows users to deploy apps in a single, configurable command.<br>
@@ -115,13 +99,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.customConfigSecret.enabled | **\*Optional\***  <br>Can be configured for external secret that contains all memphis credentials | "false" | "true" |
-| memphis.customConfigSecret.secret.name | **\*Optional\***  <br>Name of the external secret | ""  | "external-secret-name" |
-| memphis.customConfigSecret.rootPwd_key | **\*Optional\***  <br>Name of the key in secret | ""  | "rootPwd" |
-| memphis.customConfigSecret.connectionToken_key | **\*Optional\***  <br>Name of the key in secret | ""  | "connectionToken" |
-| memphis.customConfigSecret.jwtSecret_key | **\*Optional\***  <br>Name of the key in secret | ""  | "jwtSecret" |
-| memphis.customConfigSecret.refreshJwtSecret_key | **\*Optional\***  <br>Name of the key in secret | ""  | "refreshJwtSecret" |
-| memphis.customConfigSecret.encryptionSecretKey_key | **\*Optional\***  <br>Name of the key in secret | ""  | "encryptionSecretKey" |
+| 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.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.3.1
+    created: "2023-11-06T13:14:43.498881698Z"
+    dependencies:
+    - condition: metadata.enabled
+      name: metadata
+      repository: ""
+      version: 11.5.2
+    description: Memphis.dev Official Helm chart
+    digest: b0826a8819aa9f5163e99bada65abd3376173f8ae8b440815af0547b3f8660ab
+    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.2.4.tgz
+    version: 1.2.4
   - annotations:
       category: Streaming and messaging
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.3.0
-    created: "2023-09-11T14:34:46.787470749Z"
+    created: "2023-11-06T13:14:43.493065977Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -40,7 +74,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.2.0
-    created: "2023-09-11T14:34:46.781820344Z"
+    created: "2023-11-06T13:14:43.487972612Z"
     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-09-11T14:34:46.776754847Z"
+    created: "2023-11-06T13:14:43.482175174Z"
     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-09-11T14:34:46.770988673Z"
+    created: "2023-11-06T13:14:43.47707803Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -142,7 +176,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.1.1
-    created: "2023-09-11T14:34:46.765918373Z"
+    created: "2023-11-06T13:14:43.471453214Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -176,7 +210,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.1.0
-    created: "2023-09-11T14:34:46.760233904Z"
+    created: "2023-11-06T13:14:43.466352622Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -210,7 +244,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.3
-    created: "2023-09-11T14:34:46.755144221Z"
+    created: "2023-11-06T13:14:43.4604757Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -244,7 +278,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.1
-    created: "2023-09-11T14:34:46.749483111Z"
+    created: "2023-11-06T13:14:43.455291461Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -278,7 +312,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 1.0.0
-    created: "2023-09-11T14:34:46.744004237Z"
+    created: "2023-11-06T13:14:43.449447077Z"
     dependencies:
     - condition: metadata.enabled
       name: metadata
@@ -312,7 +346,7 @@ entries:
       licenses: Memphis Business Source License 1.0
     apiVersion: v2
     appVersion: 0.4.5
-    created: "2023-09-11T14:34:46.738834326Z"
+    created: "2023-11-06T13:14:43.444069429Z"
     description: Memphis.dev Official Helm chart
     digest: e3e2ca1f38e7072aea1cbe9eeaf3c79c849289422e340960b56709056a1dea0f
     home: https://github.com/memphisdev/memphis
@@ -338,7 +372,7 @@ entries:
     version: 0.4.5
   - apiVersion: v2
     appVersion: 0.4.4
-    created: "2023-09-11T14:34:46.737686981Z"
+    created: "2023-11-06T13:14:43.442538188Z"
     description: Memphis.dev Helm chart
     digest: 6cf106e15fdfe86124e30afd91f036cd28d2a549fa01eba11bb08d35eb9c953e
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -349,7 +383,7 @@ entries:
     version: 0.4.4
   - apiVersion: v2
     appVersion: 0.4.3
-    created: "2023-09-11T14:34:46.73641081Z"
+    created: "2023-11-06T13:14:43.44132592Z"
     description: Memphis.dev Helm chart
     digest: be47621169bdd4942b954945ae97eb88041ae1220165aad628648dd7b9b3d7e7
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -360,7 +394,7 @@ entries:
     version: 0.4.3
   - apiVersion: v2
     appVersion: 0.4.2
-    created: "2023-09-11T14:34:46.734646499Z"
+    created: "2023-11-06T13:14:43.440151977Z"
     description: Memphis.dev Helm chart
     digest: 3a17890606d0eb961f17a88fc5a9d2258d2071745ba21d8864946a50ed7e3ebb
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -371,7 +405,7 @@ entries:
     version: 0.4.2
   - apiVersion: v2
     appVersion: 0.4.1
-    created: "2023-09-11T14:34:46.733492882Z"
+    created: "2023-11-06T13:14:43.438940715Z"
     description: Memphis.dev Helm chart
     digest: 3901e5059d04a93f2afef1e66f0f097610c4cf41ec8f85e030c3b4749a0b1c9b
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -382,7 +416,7 @@ entries:
     version: 0.4.1
   - apiVersion: v2
     appVersion: 0.4.0
-    created: "2023-09-11T14:34:46.73232531Z"
+    created: "2023-11-06T13:14:43.437740902Z"
     description: Memphis.dev Helm chart
     digest: abe8ef969af061633e0566bcc6f764a6175d74fe378d183a79394a3c4cf99b6b
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -393,7 +427,7 @@ entries:
     version: 0.4.0
   - apiVersion: v2
     appVersion: 0.3.6
-    created: "2023-09-11T14:34:46.731180609Z"
+    created: "2023-11-06T13:14:43.436605024Z"
     description: Memphis.dev Helm chart
     digest: 1463b0842ae745cfbc39bbbd59bf4aed1829610eb3305a5c9f0e8671fb9b433e
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -404,7 +438,7 @@ entries:
     version: 0.3.6
   - apiVersion: v2
     appVersion: 0.3.5
-    created: "2023-09-11T14:34:46.730058062Z"
+    created: "2023-11-06T13:14:43.435444477Z"
     description: Memphis.dev Helm chart
     digest: 9e05f5310f8456c431041b4e44f3570e4ae7d3bdab27d58f64c2486483951a2c
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -415,7 +449,7 @@ entries:
     version: 0.3.5
   - apiVersion: v2
     appVersion: 0.3.0
-    created: "2023-09-11T14:34:46.728924895Z"
+    created: "2023-11-06T13:14:43.434214823Z"
     description: A Helm chart for Kubernetes
     digest: df8bc3b91ffd995e9ee743c4814ce37b38ac55f9366d16a07eebf5f05a03d462
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -426,7 +460,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: 0.2.2
-    created: "2023-09-11T14:34:46.727730769Z"
+    created: "2023-11-06T13:14:43.432393706Z"
     description: A Helm chart for Kubernetes
     digest: d28563593f1577bb2381da7ec7a2b1a06301b04f30202ef00627127e21606657
     icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/Vector.jpg
@@ -437,7 +471,7 @@ entries:
     version: 0.2.2
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-09-11T14:34:46.726550296Z"
+    created: "2023-11-06T13:14:43.431138469Z"
     description: A Helm chart for Kubernetes
     digest: 28d3abb9dbc8bb4e5d98e319af96bee39d7079373bc6f3ea1459f057557f07a2
     name: memphis
@@ -447,12 +481,12 @@ entries:
     version: 0.2.1
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-09-11T14:34:46.724643613Z"
+    created: "2023-11-06T13:14:43.429894662Z"
     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-09-11T14:34:46.723276795Z"
+generated: "2023-11-06T13:14:43.428503329Z"
diff --git a/charts/memphis-1.2.4.tgz b/charts/memphis-1.2.4.tgz
diff --git a/examples/external_svc.yaml b/examples/external_svc.yaml
@@ -0,0 +1,53 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: memphis-external
+  namespace: memphis
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-type: external
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
+    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
+    service.beta.kubernetes.io/aws-load-balancer-healthcheck-port: "9000"
+    service.beta.kubernetes.io/aws-load-balancer-ssl-cert:  <SSL_CERTIFICATE>
+    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "https"
+spec:
+  ports:
+  - name: https
+    port: 443
+    targetPort: 9000
+    appProtocol: https
+  - name: memphis-ws
+    port: 7770
+    targetPort: 7770
+    appProtocol: tcp
+  - name: memphis-cp-tcp
+    port: 6666
+    protocol: TCP
+    targetPort: 6666
+    appProtocol: TCP
+  selector:
+    app.kubernetes.io/instance: memphis
+    app.kubernetes.io/name: memphis
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: memphis-gw-external
+  namespace: memphis
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-type: external
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
+    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
+    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: <SSL_CERTIFICATE>
+    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "restgw"
+spec:
+  ports:
+  - name: restgw
+    port: 443
+    protocol: TCP
+    targetPort: 4444
+    appProtocol: TCP
+  selector:
+    app: memphis-rest-gateway
+  type: LoadBalancer
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.3
+version: 1.2.4
 
-appVersion: "1.3.0"
+appVersion: "1.3.1"
 
 icon: https://memphis-public-files.s3.eu-central-1.amazonaws.com/icon.png