Merge pull request meshery#4522 from meshery/helm-charts

Rebuild the charts for Meshery and the meshery-operator as the primary chart

.github/workflows/helm-chart-releaser.yml

@@ -29,8 +29,10 @@ jobs:
       with:
         version: 'v3.6.0' # default is latest stable
       id: install
-    - name: validate
+    - name: validate meshery
       run: helm lint install/kubernetes/helm/meshery --with-subcharts
+    - name: validate meshery-operator
+      run: helm lint install/kubernetes/helm/meshery-operator --with-subcharts
   release-chart:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'

Makefile

@@ -7,6 +7,9 @@ MESHERY_CLOUD_STAGING="https://staging-meshery.layer5.io"
 GIT_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1`)
 GIT_COMMITSHA=$(shell git rev-list -1 HEAD)
 RELEASE_CHANNEL="edge"
+# Please do not remove the code below(the code already removed several times), those constant will help on local CI check, like $ make chart-readme or $ make golangci-run
+GOPATH = $(shell go env GOPATH)
+GOBIN  = $(GOPATH)/bin
 
 # Build the CLI for Meshery - `mesheryctl`.
 # Build Meshery inside of a multi-stage Docker container.
@@ -161,7 +164,8 @@ docker-docs:
 
 .PHONY: chart-readme
 chart-readme:
-	go run github.com/norwoodj/helm-docs/cmd/helm-docs -c install/kubernetes/helm/
+	GO111MODULE=on go get github.com/norwoodj/helm-docs/cmd/helm-docs 
+	$(GOPATH)/bin/helm-docs -c install/kubernetes/helm/meshery-operator
 
 swagger-spec:
 	swagger generate spec -o ./helpers/swagger.yaml --scan-models

install/kubernetes/helm/meshery-operator/.helmignore

@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

install/kubernetes/helm/meshery-operator/Chart.lock

@@ -0,0 +1,36 @@
+dependencies:
+- name: meshery-istio
+  repository: ""
+  version: 2.1.2
+- name: meshery-linkerd
+  repository: ""
+  version: 2.1.2
+- name: meshery-consul
+  repository: ""
+  version: 2.1.2
+- name: meshery-kuma
+  repository: ""
+  version: 2.1.2
+- name: meshery-osm
+  repository: ""
+  version: 2.1.2
+- name: meshery-nsm
+  repository: ""
+  version: 2.1.2
+- name: meshery-traefik-mesh
+  repository: ""
+  version: 2.1.2
+- name: meshery-cpx
+  repository: ""
+  version: 2.1.2
+- name: meshery-nginx-sm
+  repository: ""
+  version: 2.1.2
+- name: meshery-app-mesh
+  repository: ""
+  version: 2.1.2
+- name: meshery
+  repository: ""
+  version: 2.1.2
+digest: sha256:b1230f6f0c6dd0017f96599eaaf38d8dc6d4127dc285a06464d5e04608754abf
+generated: "2021-10-29T15:10:39.691795+08:00"

install/kubernetes/helm/meshery-operator/Chart.yaml

@@ -0,0 +1,90 @@
+apiVersion: v2
+name: meshery-operator
+description: Meshery Operator chart.
+icon: https://meshery.io/images/logos/meshery-logo.png
+source: 
+  - https://github.com/layer5io/meshery-operator
+keywords:
+  - meshery
+  - meshery-istio
+  - meshery-linkerd
+  - meshery-consul
+  - meshery-kuma
+  - meshery-osm
+  - meshery-nsm
+  - meshery-traefik-mesh
+  - meshery-cpx
+  - meshery-nginx-sm
+  - meshery-app-mesh
+  - meshery-server
+  - meshery-broker
+  - meshery-meshsync
+deprecated: false
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.6.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+# TODO: Need the confirm the image tag.
+appVersion: 0.6.0
+
+dependencies:
+- name: meshery-istio
+  version: 2.1.2
+  condition: meshery-istio.enabled
+- name: meshery-linkerd
+  version: 2.1.2
+  condition: meshery-linkerd.enabled
+- name: meshery-consul
+  version: 2.1.2
+  condition: meshery-consul.enabled
+- name: meshery-kuma
+  version: 2.1.2
+  condition: meshery-kuma.enabled
+- name: meshery-osm
+  version: 2.1.2
+  condition: meshery-osm.enabled
+- name: meshery-nsm
+  version: 2.1.2
+  condition: meshery-nsm.enabled
+- name: meshery-traefik-mesh
+  version: 2.1.2
+  condition: meshery-traefik-mesh.enabled
+- name: meshery-cpx
+  version: 2.1.2
+  condition: meshery-cpx.enabled
+- name: meshery-nginx-sm
+  version: 2.1.2
+  condition: meshery-nginx-sm.enabled
+- name: meshery-app-mesh
+  version: 2.1.2
+  condition: meshery-app-mesh.enabled
+- name: meshery
+  version: 2.1.2
+  condition: meshery.enabled
+- name: meshery-broker
+  version: 0.1.0
+  condition: meshery-broker.enabled
+- name: meshery-meshsync
+  version: 0.1.0
+  condition: meshery-meshsync.enabled
+
+maintainers:
+  - name: Layer5 Authors
+    email: [email protected]
+  - name: aisuko
+    email: [email protected]
+  - name: leecalcote
+    email: [email protected]

install/kubernetes/helm/meshery-operator/README.md

@@ -0,0 +1,112 @@
+# meshery-operator
+
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square)
+
+Meshery Operator chart.
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Layer5 Authors | [email protected] |  |
+| aisuko | [email protected] |  |
+| leecalcote | [email protected] |  |
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+|  | meshery | 2.1.2 |
+|  | meshery-app-mesh | 2.1.2 |
+|  | meshery-broker | 0.1.0 |
+|  | meshery-consul | 2.1.2 |
+|  | meshery-cpx | 2.1.2 |
+|  | meshery-istio | 2.1.2 |
+|  | meshery-kuma | 2.1.2 |
+|  | meshery-linkerd | 2.1.2 |
+|  | meshery-meshsync | 0.1.0 |
+|  | meshery-nginx-sm | 2.1.2 |
+|  | meshery-nsm | 2.1.2 |
+|  | meshery-osm | 2.1.2 |
+|  | meshery-traefik-mesh | 2.1.2 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| annotations | object | `{}` |  |
+| env | object | `{}` |  |
+| fullnameOverride | string | `""` |  |
+| imagePullSecrets | list | `[]` |  |
+| ingress.annotations | object | `{}` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts[0].host | string | `"chart-example.local"` |  |
+| ingress.hosts[0].paths | list | `[]` |  |
+| ingress.tls | list | `[]` |  |
+| kubeRbac.args[0] | string | `"--secure-listen-address=0.0.0.0:8443"` |  |
+| kubeRbac.args[1] | string | `"--upstream=http://127.0.0.1:8080/"` |  |
+| kubeRbac.args[2] | string | `"--logtostderr=false"` |  |
+| kubeRbac.args[3] | string | `"--v=10"` |  |
+| kubeRbac.image.pullPolicy | string | `"IfNotPresent"` |  |
+| kubeRbac.image.repository | string | `"gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0"` |  |
+| kubeRbac.name | string | `"kube-rbac-proxy"` |  |
+| meshery-app-mesh | object | `{"enabled":false,"fullnameOverride":"meshery-app-mesh","serviceAccountNameOverride":"meshery-server"}` |  If need to use a different service accounts for the adapters, modify the serviceAccountNameOverride for the corresponding adapters here, or set the serviceAccountNameOverride to empty while setting the serviceAccount information in the sub-chart accordingly |
+| meshery-broker.enabled | bool | `true` |  |
+| meshery-broker.fullnameOverride | string | `"meshery-broker"` |  |
+| meshery-broker.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-consul.enabled | bool | `true` |  |
+| meshery-consul.fullnameOverride | string | `"meshery-consul"` |  |
+| meshery-consul.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-cpx.enabled | bool | `false` |  |
+| meshery-cpx.fullnameOverride | string | `"meshery-cpx"` |  |
+| meshery-cpx.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-istio.enabled | bool | `true` |  |
+| meshery-istio.fullnameOverride | string | `"meshery-istio"` |  |
+| meshery-istio.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-kuma.enabled | bool | `true` |  |
+| meshery-kuma.fullnameOverride | string | `"meshery-kuma"` |  |
+| meshery-kuma.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-linkerd.enabled | bool | `true` |  |
+| meshery-linkerd.fullnameOverride | string | `"meshery-linkerd"` |  |
+| meshery-linkerd.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-meshsync.enabled | bool | `true` |  |
+| meshery-meshsync.fullnameOverride | string | `"meshery-meshsync"` |  |
+| meshery-meshsync.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-nginx-sm.enabled | bool | `false` |  |
+| meshery-nginx-sm.fullnameOverride | string | `"meshery-nginx-sm"` |  |
+| meshery-nginx-sm.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-nsm.enabled | bool | `false` |  |
+| meshery-nsm.fullnameOverride | string | `"meshery-nsm"` |  |
+| meshery-nsm.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-osm.enabled | bool | `true` |  |
+| meshery-osm.fullnameOverride | string | `"meshery-osm"` |  |
+| meshery-osm.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery-traefik-mesh.enabled | bool | `false` |  |
+| meshery-traefik-mesh.fullnameOverride | string | `"meshery-traefik-mesh"` |  |
+| meshery-traefik-mesh.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| meshery.enabled | bool | `true` |  |
+| meshery.fullnameOverride | string | `"meshery-server"` |  |
+| meshery.serviceAccountNameOverride | string | `"meshery-server"` |  |
+| mesheryOperator.args[0] | string | `"--metrics-addr=127.0.0.1:8080"` |  |
+| mesheryOperator.args[1] | string | `"--enable-leader-election"` |  |
+| mesheryOperator.command[0] | string | `"/manager"` |  |
+| mesheryOperator.image.pullPolicy | string | `"IfNotPresent"` |  |
+| mesheryOperator.image.repository | string | `"layer5/meshery-operator:stable-latest"` |  |
+| mesheryOperator.name | string | `"manager"` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| podSecurityContext | object | `{}` |  |
+| probe.livenessProbe.enabled | bool | `false` |  |
+| probe.readinessProbe.enabled | bool | `false` |  |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| securityContext | object | `{}` |  |
+| service.annotations | object | `{}` |  |
+| service.port | int | `10000` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceAccount.create | string | `"create"` |  |
+| serviceAccount.name | string | `"meshery-operator"` |  If not set and create is false, a name is generated using the fullname template |
+| testCase.enabled | bool | `false` |  |
+| tolerations | list | `[]` |  |
+

install/kubernetes/helm/meshery-operator/charts/meshery-app-mesh/.helmignore

@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

install/kubernetes/helm/meshery-operator/charts/meshery-app-mesh/Chart.yaml

@@ -0,0 +1,32 @@
+apiVersion: v2
+name: meshery-app-mesh
+description: Meshery Adapter for App Mesh chart.
+source: 
+  - https://github.com/layer5io/meshery-app-mesh
+
+deprecated: false
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 2.1.2
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+# TODO: Need the confirm the image tag.
+appVersion: stable-latest
+
+maintainers:
+  - name: aisuko
+    email: [email protected]
+  - name: leecalcote
+    email: [email protected]

install/kubernetes/helm/meshery-operator/charts/meshery-app-mesh/README.md

@@ -0,0 +1,45 @@
+# meshery-app-mesh
+
+![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: stable-latest](https://img.shields.io/badge/AppVersion-stable--latest-informational?style=flat-square)
+
+Meshery Adapter for App Mesh chart.
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| aisuko | [email protected] |  |
+| leecalcote | [email protected] |  |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| annotations | object | `{}` |  |
+| env | object | `{}` |  |
+| fullnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"Always"` |  |
+| image.repository | string | `"layer5/meshery-app-mesh:stable-latest"` |  |
+| imagePullSecrets | list | `[]` |  |
+| ingress.annotations | string | `nil` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts | list | `[{"host":"chart-example.local","paths":[]}]` |  kubernetes.io/tls-acme: "true" |
+| ingress.tls | list | `[]` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| podSecurityContext | object | `{}` |  |
+| probe.livenessProbe.enabled | bool | `false` |  |
+| probe.readinessProbe.enabled | bool | `false` |  |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| securityContext | object | `{}` |  |
+| service.annotations | object | `{}` |  |
+| service.port | int | `10005` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceAccount.create | bool | `false` |  |
+| serviceAccount.name | string | `""` |  If not set and create is true, a name is generated using the fullname template |
+| serviceAccountNameOverride | string | `""` |  |
+| testCase.enabled | bool | `false` |  |
+| tolerations | list | `[]` |  |
+