diff --git a/stable/weave-scope/Chart.yaml b/stable/weave-scope/Chart.yaml index 480b37cb8f..e14a047a11 100644 --- a/stable/weave-scope/Chart.yaml +++ b/stable/weave-scope/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: weave-scope -version: 1.1.1 -appVersion: 1.11.1 +version: 1.1.2 +appVersion: 1.11.2 description: A Helm chart for the Weave Scope cluster visualizer. keywords: - containers diff --git a/stable/weave-scope/README.md b/stable/weave-scope/README.md index ffc2be25e5..f642c2dcdb 100644 --- a/stable/weave-scope/README.md +++ b/stable/weave-scope/README.md @@ -49,7 +49,7 @@ Note that most of this documentation is repeated in `values.yaml`; if you're in |----------:|:------------|:--------| | **image.*** | the parameters of the image pulls for this release | | | **image.repository** | the image that will be used for this release (required) | `weaveworks/scope` | -| **image.tag** | the version of Weave Scope desired for this release (required) | `1.11.1` +| **image.tag** | the version of Weave Scope desired for this release (required) | `1.11.2` | **image.pullPolicy** | the imagePullPolicy for the container (required): IfNotPresent, Always, or Never | `IfNotPresent` | **service.*** | the configuration of the service used to access the frontend | | | **service.name** | the short name desired for the frontend service (optional, but if not specified by the user a value will be calculated) -- this is a global so we can access its value easily from the agent subchart | `weave-scope-app` | @@ -90,6 +90,11 @@ The **agent** section controls how the Weave Scope node agent pods are installed | **resources.requests.memory** | memory request in MiB (Mi)| | | **resources.limits.cpu** | CPU limit in MHz (m) | | | **resources.limits.memory** | memory limit in MiB (Mi) | | +| **ingress.enabled** | Enables Ingress for weave-scope-frontend | false | +| **ingress.annotations** | Ingress annotations | {} | +| **ingress.paths** | Ingress paths | [] | +| **ingress.hosts** | Ingress accepted hostnames | nil | +| **ingress.tls** | Ingress TLS configuration | [] | ## Other notes diff --git a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml index 0ca5a2e038..d3d876e067 100644 --- a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml @@ -1,7 +1,7 @@ description: A Helm chart for the Weave Scope cluster visualizer node agent. name: weave-scope-agent -version: 0.10.0 -appVersion: 1.9.1 +version: 1.1.2 +appVersion: 1.11.2 keywords: - containers - dashboard diff --git a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml index f871848fd5..79b4651d04 100644 --- a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml @@ -1,7 +1,7 @@ description: A Helm chart for the Weave Scope cluster visualizer frontend. name: weave-scope-frontend -version: 0.10.0 -appVersion: 1.9.1 +version: 1.1.2 +appVersion: 1.11.2 keywords: - containers - dashboard diff --git a/stable/weave-scope/charts/weave-scope-frontend/templates/ingress.yaml b/stable/weave-scope/charts/weave-scope-frontend/templates/ingress.yaml new file mode 100644 index 0000000000..dc7188dda9 --- /dev/null +++ b/stable/weave-scope/charts/weave-scope-frontend/templates/ingress.yaml @@ -0,0 +1,39 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := .Values.global.service.name | default (include "toplevel.fullname" .) -}} +{{- $ingressPaths := .Values.ingress.paths -}} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + labels: + {{- include "weave-scope-frontend.helm_std_labels" . | indent 4 }} + component: frontend + name: {{ template "weave-scope-frontend.fullname" . }} + annotations: + {{- include "weave-scope.annotations" . | indent 4 }} + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ . | quote }} + http: + paths: + {{- range $ingressPaths }} + - path: {{ . }} + backend: + serviceName: {{ $fullName }} + servicePort: http + {{- end }} + {{- end }} +{{- end }} diff --git a/stable/weave-scope/values.yaml b/stable/weave-scope/values.yaml index 0fedd37b71..3e9caabf45 100644 --- a/stable/weave-scope/values.yaml +++ b/stable/weave-scope/values.yaml @@ -4,7 +4,7 @@ global: # global.image: the image that will be used for this release image: repository: weaveworks/scope - tag: 1.11.1 + tag: 1.11.2 # global.image.pullPolicy: must be Always, IfNotPresent, or Never pullPolicy: "IfNotPresent" # global.service.*: the configuration of the service used to access the frontend @@ -36,6 +36,24 @@ weave-scope-frontend: # cpu: "" # weave-scope-frontend.resources.limits.memory: memory limit in MiB (Mi) # memory: "" + # weave-scope-frontend Ingress + ingress: + # If true, weave-scope-frontend ingress will be created + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + # weave-scope-frontend path(s) must be provided if Ingress is enabled + paths: [] + # weave-scope-frontend hostname(s) must be provided if Ingress is enabled + hosts: + - weave-scope.example.test + # Ingress TLS secret + # Must be created manually in the namespace + tls: [] + # - secretName: weave-scope-example-tls + # hosts: + # - weave-scope.example.test # weave-scope-agent.* controls how the Weave Scope node agent pods are installed weave-scope-agent: