Merge remote-tracking branch 'origin/master' into dev

.github/workflows/docs.yml

@@ -13,32 +13,40 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # Web site
+      - name: Add some files
+        run: |
+          echo "akhq.io" > docs/CNAME
+          cp LICENSE docs/LICENSE
+          cp README.md docs/README.md
+          cp README.md docs/README
+          cp artifacthub-repo.yml docs/artifacthub-repo.yml
+
       # Helm charts
       - uses: J12934/helm-gh-pages-action@master
         with:
           access-token: ${{ secrets.GITHUB_PERSONAL_TOKEN }}
           charts-folder: "helm"
           deploy-branch: helm
 
-      # Web site
-      - name: Contributor
-        run: |
-          npm i github-contributors-list
-          node_modules/.bin/githubcontrib --repo akhq --owner tchiotludo --format html --sortOrder desc > docs/contributors.html
-
       # Clone helm charts
       - name: Clone helm charts
         uses: actions/checkout@v2
         with:
           ref: helm
           path: tmp-helm
 
-      # Web site
+      # Add helm charts
       - name: Add helm charts
         run: |
           rm -rf tmp-helm/.git
           cp -R tmp-helm/* docs/
-          echo "akhq.io" > docs/CNAME
+
+      # Contributors
+      - name: Contributor
+        run: |
+          npm i github-contributors-list
+          node_modules/.bin/githubcontrib --repo akhq --owner tchiotludo --format html --sortOrder desc > docs/contributors.html
 
       # Deploy
       - name: Deploy

README.md

@@ -6,6 +6,7 @@
 ![Github Downloads](https://img.shields.io/github/downloads/tchiotludo/akhq/total)
 ![Github Start](https://img.shields.io/github/stars/tchiotludo/akhq.svg)
 ![Main](https://github.com/tchiotludo/akhq/workflows/Main/badge.svg)
+[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/akhq)](https://artifacthub.io/packages/search?repo=akhq)
 
 > Kafka GUI for [Apache Kafka](http://kafka.apache.org/) to manage topics, topics data, consumers group, schema registry, connect and more...
 

artifacthub-repo.yml

@@ -0,0 +1 @@
+repositoryID: 4ff0915c-0d71-4f9b-9440-2038c81039f9

helm/akhq/Chart.yaml

@@ -2,12 +2,13 @@ apiVersion: v1
 appVersion: "1.0"
 description: Kafka GUI for Apache Kafka to manage topics, topics data, consumers group, schema registry, connect and more...
 name: akhq
-version: 0.1.2
+version: 0.1.3
 keywords:
   - kafka
   - confluent
-  - timeseries
-  - influxdata
+  - gui
+  - schema-registry
+  - kafka-connect
 home: https://akhq.io
 icon: https://raw.githubusercontent.com/tchiotludo/akhq/master/client/src/images/logo_black.png
 sources:

helm/akhq/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "akhq.fullname" . }}
-  {{- with .Values.image.annotations }}
+  {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -37,6 +37,10 @@ spec:
       imagePullSecrets:
         {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
+      {{- if .Values.securityContext }}
+      securityContext:
+        {{ toYaml .Values.securityContext | indent 8 }}
+      {{- end }}
       {{- if .Values.initContainers }}
       initContainers:
         {{- range $key, $value := .Values.initContainers }}
@@ -49,15 +53,13 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
           env:
-          {{- if .Values.secrets }}
-          - name: MICRONAUT_ENVIRONMENTS
-            value: secrets
-          - name: MICRONAUT_CONFIG_FILES
-            value: /app/application.yml,/app/application-secrets.yml
-          {{- end }}
-          {{- with .Values.image.extraEnv }}
-{{ toYaml . | trim | indent 10 }}
-          {{- end }}
+            {{- if $.Values.extraEnv }}{{ toYaml $.Values.extraEnv | trim | nindent 12 }}{{ end }}
+            {{- if .Values.secrets }}
+            - name: MICRONAUT_ENVIRONMENTS
+              value: secrets
+            - name: MICRONAUT_CONFIG_FILES
+              value: /app/application.yml,/app/application-secrets.yml
+            {{- end }}
           volumeMounts:
           {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 12 }}{{ end }}
           {{- if .Values.configuration }}

helm/akhq/values.yaml

@@ -1,22 +1,26 @@
-#imagePullSecrets:
+# imagePullSecrets:
 #  - name: my-repository-secret
 image:
   repository: tchiotludo/akhq
   tag: latest
-  annotations: {}
-    #prometheus.io/scrape: 'true'
-    #prometheus.io/port: '8080'
-    #prometheus.io/path: '/metrics'
-  extraEnv: []
-  ## You can put directly your configuration here...
-  # - name: AKHQ_CONFIGURATION
-  #   value: |
-  #       akhq:
-  #         secrets:
-  #           docker-kafka-server:
-  #             properties:
-  #               bootstrap.servers: "kafka:9092"
 
+# custom annotations (example: for prometheus)
+annotations: {}
+  #prometheus.io/scrape: 'true'
+  #prometheus.io/port: '8080'
+  #prometheus.io/path: '/prometheus'
+
+## You can put directly your configuration here... or add java opts or any other env vars
+extraEnv: []
+# - name: AKHQ_CONFIGURATION
+#   value: |
+#       akhq:
+#         secrets:
+#           docker-kafka-server:
+#             properties:
+#               bootstrap.servers: "kafka:9092"
+# - name: JAVA_OPTS
+#   value: "-Djavax.net.ssl.trustStore=/usr/local/openjdk-11/lib/security/cacerts -Djavax.net.ssl.trustStorePassword=password"
 
 ## Or you can also use configmap for the configuration...
 configuration: |
@@ -25,6 +29,7 @@ configuration: |
       access-log: 
         enabled: false 
         name: org.akhq.log.access
+
 ##... and secret for connection information
 secrets: |
   akhq:
@@ -41,10 +46,13 @@ secrets: |
             url: "http://connect:8083"
             basic-auth-username: basic-auth-user
             basic-auth-password: basic-auth-pass
+
 # Any extra volumes to define for the pod (like keystore/truststore)
 extraVolumes: []
+
 # Any extra volume mounts to define for the akhq container
 extraVolumeMounts: []
+
 # Add your own init container or uncomment and modify the example.
 initContainers: {}
 #   create-keystore: 
@@ -54,6 +62,14 @@ initContainers: {}
 #      - mountPath: /tmp
 #        name: certs
 
+securityContext: {}
+#  capabilities:
+#    drop:
+#      - ALL
+#  # readOnlyRootFilesystem: true
+#  runAsNonRoot: true
+#  runAsUser: 1000
+
 service:
   enabled: true
   type: ClusterIP
@@ -86,4 +102,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}