Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kubernetes/chart/zulip/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ dependencies:
sources:
- https://github.com/zulip/zulip
- https://github.com/zulip/docker-zulip
- https://hub.docker.com/r/zulip/docker-zulip
- https://github.com/orgs/zulip/packages/container/package/zulip
15 changes: 8 additions & 7 deletions kubernetes/chart/zulip/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ Now you're ready to follow [the installation instructions above](#installation).
| affinity | object | `{}` | Affinity for pod assignment. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity |
| fullnameOverride | string | `""` | Fully override common.names.fullname template. |
| image.pullPolicy | string | `"IfNotPresent"` | Pull policy for Zulip docker image. Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images |
| image.repository | string | `"zulip/docker-zulip"` | Defaults to hub.docker.com/zulip/docker-zulip, but can be overwritten with a full HTTPS address. |
| image.tag | string | `"6.1-0"` | Zulip image tag (immutable tags are recommended) |
| image.repository | string | `"ghcr.io/zulip/zulip"` | Image repository. Override this only if using a forked or otherwise custom image. |
| image.tag | string | `"6.1-1"` | Zulip image tag (immutable tags are recommended) |
| imagePullSecrets | list | `[]` | Global Docker registry secret names as an array. |
| ingress.annotations | object | `{}` | Can be used to add custom Ingress annotations. |
| ingress.enabled | bool | `false` | Enable this to use an Ingress to reach the Zulip service. |
Expand Down Expand Up @@ -116,11 +116,12 @@ Now you're ready to follow [the installation instructions above](#installation).
## About this helm chart

This helm chart sets up a StatefulSet that runs a Zulip pod, that in turn runs
the [docker-zulip](https://hub.docker.com/r/zulip/docker-zulip/) Dockerized
Zulip version. Configuration of Zulip happens through environment variables that
are defined in the `values.yaml` under `zulip.environment`. These environment
variables are forwarded to the Docker container, you can read more about
configuring Zulip through environment variables
the [Dockerized Zulip
version](https://github.com/orgs/zulip/packages/container/package/zulip).
Configuration of Zulip happens through environment variables that are defined
in the `values.yaml` under `zulip.environment`. These environment variables are
forwarded to the Docker container, you can read more about configuring Zulip
through environment variables
[here](https://github.com/zulip/docker-zulip/#configuration).

### Dependencies
Expand Down
11 changes: 6 additions & 5 deletions kubernetes/chart/zulip/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ Now you're ready to follow [the installation instructions above](#installation).
## About this helm chart

This helm chart sets up a StatefulSet that runs a Zulip pod, that in turn runs
the [docker-zulip](https://hub.docker.com/r/zulip/docker-zulip/) Dockerized
Zulip version. Configuration of Zulip happens through environment variables that
are defined in the `values.yaml` under `zulip.environment`. These environment
variables are forwarded to the Docker container, you can read more about
configuring Zulip through environment variables
the [Dockerized Zulip
version](https://github.com/orgs/zulip/packages/container/package/zulip).
Configuration of Zulip happens through environment variables that are defined
in the `values.yaml` under `zulip.environment`. These environment variables are
forwarded to the Docker container, you can read more about configuring Zulip
through environment variables
[here](https://github.com/zulip/docker-zulip/#configuration).

### Dependencies
Expand Down
6 changes: 3 additions & 3 deletions kubernetes/chart/zulip/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
# ```

image:
# -- Defaults to hub.docker.com/zulip/docker-zulip, but can be overwritten with a full HTTPS address.
repository: zulip/docker-zulip
# -- Override this only if using a forked or otherwise custom image. |
repository: ghcr.io/zulip/zulip
# -- Pull policy for Zulip docker image.
# Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
pullPolicy: IfNotPresent
# -- Zulip image tag (immutable tags are recommended)
tag: "6.1-0"
tag: "6.1-1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now can't do this version bump without a tag, so it needs to come after the PR merges. The commit message needs top be massaged accordingly, I think.


# -- Global Docker registry secret names as an array.
imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/manual/zulip-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ spec:
- name: postgresql-persistent-storage
mountPath: /var/lib/postgresql
- name: zulip
image: zulip/docker-zulip:6.1-0
image: ghcr.io/zulip/zulip:6.1-1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto above.

resources:
limits:
cpu: 100m
Expand Down