Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update private registry support in chart #1009

Merged
merged 1 commit into from Apr 30, 2018
Merged

Update private registry support in chart #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions chart/voyager/README.md
View file
Open in desktop
Expand Up @@ -46,14 +46,18 @@ The following tables lists the configurable parameters of the Voyager chart and

| Parameter | Description | Default |
| ------------------------------------| ------------------------------------------------------------- | ----------------------|
| `dockerRegistry` | Docker registry used to pull Voyager related images | `appscode` |
| `imageTags.voyager` | Tag of Voyager operator image | `6.0.0` |
| `imageTags.haproxy` | Tag of HAProxy container image | `1.8.8-6.1.0` |
| `replicaCount` | Number of operator replicas to create (only 1 is supported) | `1` |
| `voyager.registry` | Docker registry used to pull Voyager image | `appscode` |
| `voyager.repository` | Voyager container image | `voyager` |
| `voyager.tag` | Voyager container image tag | `6.0.0` |
| `haproxy.registry` | Docker registry used to pull HAProxy image | `appscode` |
| `haproxy.repository` | HAProxy container image | `haproxy` |
| `haproxy.tag` | HAProxy container image tag | `1.8.8-6.0.0` |
| `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `cloudProvider` | Name of cloud provider | `nil` |
| `cloudConfig` | Path to cloud config | `` |
| `criticalAddon` | If true, installs voyager operator as critical addon | `false` |
| `criticalAddon` | If true, installs Voyager operator as critical addon | `false` |
| `logLevel` | Log level for operator | `3` |
| `persistence.enabled` | Enable mounting cloud config | `false` |
| `persistence.hostPath` | Host mount path for cloud config | `/etc/kubernetes` |
Expand All @@ -66,7 +70,7 @@ The following tables lists the configurable parameters of the Voyager chart and
| `apiserver.versionPriority` | The ordering of this API inside of the group. | 15 |
| `apiserver.enableValidatingWebhook` | Configure apiserver as adission webhooks for Voyager CRDs | false |
| `apiserver.ca` | CA certificate used by main Kubernetes api server | `` |
| `enableAnalytics` | Send usage events to Google Analytics | `true` |
| `enableAnalytics` | Send usage events to Google Analytics | `true` |

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:

Expand Down
10 changes: 5 additions & 5 deletions chart/voyager/templates/deployment.yaml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ metadata:
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
replicas: 1
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: "{{ template "voyager.name" . }}"
Expand All @@ -31,7 +31,7 @@ spec:
{{- end }}
containers:
- name: voyager
image: {{ .Values.dockerRegistry }}/voyager:{{ .Values.imageTags.voyager }}
image: {{ .Values.voyager.registry }}/{{ .Values.voyager.repository }}:{{ .Values.voyager.tag }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
args:
- run
Expand All @@ -41,9 +41,9 @@ spec:
- --rbac={{ .Values.rbac.create }}
- --ingress-class={{ .Values.ingressClass }}
- --operator-service={{ template "voyager.fullname" . }}
- --docker-registry={{ .Values.dockerRegistry }}
- --haproxy-image-tag={{ .Values.imageTags.haproxy }}
- --exporter-image-tag={{ .Values.imageTags.voyager }}
- --docker-registry={{ .Values.haproxy.registry }}
- --haproxy-image-tag={{ .Values.haproxy.tag }}
- --exporter-image-tag={{ .Values.voyager.tag }}
- --secure-port=8443
- --audit-log-path=-
- --tls-cert-file=/var/serving-cert/tls.crt
Expand Down
16 changes: 9 additions & 7 deletions chart/voyager/values.yaml
View file
Open in desktop
@@ -1,14 +1,16 @@
##
## Voyager chart configuration
##
replicaCount: 1
# Docker registry containing Voyager & HAProxy images
dockerRegistry: appscode
## Tags for Docker images
imageTags:
## Docker image tag containing Voyager
voyager: 6.0.0
## Docker image tag containing HAProxy binary
haproxy: 1.8.8-6.1.0
voyager:
registry: appscode
repository: voyager
tag: 6.0.0
haproxy:
registry: appscode
repository: haproxy
tag: 1.8.8-6.1.0
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
Expand Down