Skip to content

Commit

Permalink
rename kubeapps-dashboard svc to sound more internal (#603)
Browse files Browse the repository at this point in the history
* rename kubeapps-dashboard svc to sound more internal

In order to avoid confusion around the `kubeapps-dashboard` and
`kubeapps` Service, we should rename the the `kubeapps-dashboard`
Service to sound like more of an internal component rather than a
possible entrypoint to the dashboard.

* Revert "rename kubeapps-dashboard svc to sound more internal"

This reverts commit 91772ec.

* use internal prefix for internal components

* improve chart values documentation, surface common config

* bump to 0.4.2
  • Loading branch information
prydonius committed Sep 12, 2018
1 parent f352719 commit e6f0741
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 71 deletions.
2 changes: 1 addition & 1 deletion chart/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: kubeapps
version: 0.4.3
version: 0.4.4
appVersion: DEVEL
description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
Expand Down
14 changes: 7 additions & 7 deletions chart/kubeapps/templates/_helpers.tpl
Expand Up @@ -51,42 +51,42 @@ Create chart name and version as used by the chart label.
Create name for the apprepository-controller based on the fullname
*/}}
{{- define "kubeapps.apprepository.fullname" -}}
{{ template "kubeapps.fullname" . }}-apprepository-controller
{{ template "kubeapps.fullname" . }}-internal-apprepository-controller
{{- end -}}

{{/*
Create name for the apprepository bootstrap job
*/}}
{{- define "kubeapps.apprepository-jobs-bootstrap.fullname" -}}
{{ template "kubeapps.fullname" . }}-apprepository-jobs-bootstrap
{{ template "kubeapps.fullname" . }}-internal-apprepository-jobs-bootstrap
{{- end -}}

{{/*
Create name for the apprepository cleanup job
*/}}
{{- define "kubeapps.apprepository-jobs-cleanup.fullname" -}}
{{ template "kubeapps.fullname" . }}-apprepository-jobs-cleanup
{{ template "kubeapps.fullname" . }}-internal-apprepository-jobs-cleanup
{{- end -}}

{{/*
Create name for the chartsvc based on the fullname
*/}}
{{- define "kubeapps.chartsvc.fullname" -}}
{{ template "kubeapps.fullname" . }}-chartsvc
{{ template "kubeapps.fullname" . }}-internal-chartsvc
{{- end -}}

{{/*
Create name for the dashboard based on the fullname
*/}}
{{- define "kubeapps.dashboard.fullname" -}}
{{ template "kubeapps.fullname" . }}-dashboard
{{ template "kubeapps.fullname" . }}-internal-dashboard
{{- end -}}

{{/*
Create name for the dashboard config based on the fullname
*/}}
{{- define "kubeapps.dashboard-config.fullname" -}}
{{ template "kubeapps.fullname" . }}-dashboard-config
{{ template "kubeapps.fullname" . }}-internal-dashboard-config
{{- end -}}

{{/*
Expand All @@ -100,5 +100,5 @@ Create name for the frontend config based on the fullname
Create name for the tiller-proxy based on the fullname
*/}}
{{- define "kubeapps.tiller-proxy.fullname" -}}
{{ template "kubeapps.fullname" . }}-tiller-proxy
{{ template "kubeapps.fullname" . }}-internal-tiller-proxy
{{- end -}}
135 changes: 72 additions & 63 deletions chart/kubeapps/values.yaml
@@ -1,7 +1,52 @@
# Default values for kubeapps.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
apprepository:
# The frontend service is the main reverse proxy used to access the Kubeapps UI
# To expose Kubeapps externally either configure the ingress object below or
# set frontend.service.type=LoadBalancer in the frontend configuration.
ingress:
enabled: false
annotations: {}
path: /
hosts:
- kubeapps.local
tls: []
# - secretName: chart-example-tls
# hosts:
# - chart-example.local

frontend:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.14.0-r27
service:
port: 80
type: ClusterIP
annotations: {}
livenessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 60
timeoutSeconds: 5
readinessProbe:
httpGet:
path: /
port: 8080
initialDelaySeconds: 0
timeoutSeconds: 5
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

# AppRepository Controller is the controller used to manage the repositories to
# sync. Set apprepository.initialRepos to configure the initial set of
# repositories to use when first installing Kubeapps.
image:
registry: docker.io
repository: kubeapps/apprepository-controller
Expand Down Expand Up @@ -35,14 +80,23 @@ apprepository:
nodeSelector: {}
tolerations: []
affinity: {}

chartsvc:

# Tiller Proxy is a secure REST API on top of Helm's Tiller component used to
# manage Helm chart releases in the cluster from Kubeapps. Set tillerProxy.host
# to configure a different Tiller host to use.
tillerProxy:
image:
registry: docker.io
repository: kubeapps/chartsvc
repository: kubeapps/tiller-proxy
tag: latest
service:
port: 8080
host: tiller-deploy.kube-system:44134
tls: {}
# ca:
# cert:
# key:
# verify: false
resources: {}
# limits:
# cpu: 100m
Expand All @@ -54,25 +108,14 @@ chartsvc:
tolerations: []
affinity: {}

dashboard:
# Chartsvc is used to serve chart metadata over a REST API.
chartsvc:
image:
registry: docker.io
repository: kubeapps/dashboard
repository: kubeapps/chartsvc
tag: latest
service:
port: 8080
livenessProbe:
httpGet:
path: /
port: 8080
initialDelaySeconds: 60
timeoutSeconds: 5
readinessProbe:
httpGet:
path: /
port: 8080
initialDelaySeconds: 0
timeoutSeconds: 5
resources: {}
# limits:
# cpu: 100m
Expand All @@ -84,18 +127,19 @@ dashboard:
tolerations: []
affinity: {}

frontend:
# Dashboard serves the compiled static React frontend application. This is an
# internal service used by the main frontend reverse-proxy and should not be
# accessed directly.
dashboard:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.14.0-r27
repository: kubeapps/dashboard
tag: latest
service:
port: 80
type: ClusterIP
annotations: {}
port: 8080
livenessProbe:
httpGet:
path: /healthz
path: /
port: 8080
initialDelaySeconds: 60
timeoutSeconds: 5
Expand All @@ -116,41 +160,6 @@ frontend:
tolerations: []
affinity: {}

tillerProxy:
image:
registry: docker.io
repository: kubeapps/tiller-proxy
tag: latest
service:
port: 8080
host: tiller-deploy.kube-system:44134
tls: {}
# ca:
# cert:
# key:
# verify: false
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}

ingress:
enabled: false
annotations: {}
path: /
hosts:
- kubeapps.local
tls: []
# - secretName: chart-example-tls
# hosts:
# - chart-example.local

mongodb:
# Kubeapps uses MongoDB as a cache and persistence is not required
persistence:
Expand Down

0 comments on commit e6f0741

Please sign in to comment.