Skip to content

Commit 7afa689

Browse files
authored
Merge pull request #2303 from cdr/helm-db7f
Move helm from root and fix stuff in README
2 parents affa64c + f4d48bc commit 7afa689

19 files changed

+32
-28
lines changed

.github/CODEOWNERS

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
charts/code-server @Matthew-Beckett @alexgorbatchev
2-
* @code-asher @nhooyr
1+
* @code-asher @nhooyr
2+
3+
ci/helm-chart @Matthew-Beckett @alexgorbatchev

.github/workflows/helm_validation.yaml

-14
This file was deleted.

ci/dev/fmt.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ main() {
1919
"*.yaml"
2020
"*.yml"
2121
)
22-
prettier --write --loglevel=warn $(git ls-files "${prettierExts[@]}")
22+
prettier --write --loglevel=warn $(
23+
git ls-files "${prettierExts[@]}" | grep -v 'helm-chart'
24+
)
2325

2426
doctoc --title '# FAQ' doc/FAQ.md > /dev/null
2527
doctoc --title '# Setup Guide' doc/guide.md > /dev/null

ci/dev/lint.sh

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ main() {
88
stylelint $(git ls-files "*.css")
99
tsc --noEmit
1010
shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh")
11+
helm kubeval ci/helm-chart
1112
}
1213

1314
main "$@"
File renamed without changes.
File renamed without changes.

charts/code-server/README.md renamed to ci/helm-chart/README.md

+13-10
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ This chart is community maintained by [@Matthew-Beckett](https://github.com/Matt
1010
## TL;DR;
1111

1212
```console
13-
$ git clone https://github.com/cdr/code-server.git
14-
$ helm install code-server/charts/code-server
13+
$ git clone https://github.com/cdr/code-server
14+
$ cd code-server
15+
$ helm upgrade --install code-server ci/helm-chart
1516
```
1617

1718
## Introduction
@@ -26,10 +27,12 @@ package manager.
2627

2728
## Installing the Chart
2829

29-
To install the chart with the release name `my-release`:
30+
To install the chart with the release name `code-server`:
3031

3132
```console
32-
$ helm install --name my-release charts/code-server
33+
$ git clone https://github.com/cdr/code-server
34+
$ cd code-server
35+
$ helm upgrade --install code-server ci/helm-chart
3336
```
3437

3538
The command deploys code-server on the Kubernetes cluster in the default
@@ -40,10 +43,10 @@ that can be configured during installation.
4043
4144
## Uninstalling the Chart
4245

43-
To uninstall/delete the `my-release` deployment:
46+
To uninstall/delete the `code-server` deployment:
4447

4548
```console
46-
$ helm delete my-release
49+
$ helm delete code-server
4750
```
4851

4952
The command removes all the Kubernetes components associated with the chart and
@@ -97,9 +100,9 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
97100
install`. For example,
98101

99102
```console
100-
$ helm install --name my-release \
101-
--set persistence.enabled=false \
102-
deployment/chart
103+
$ helm install code-server \
104+
ci/helm-chart \
105+
--set persistence.enabled=false
103106
```
104107

105108
The above command sets the the persistence storage to false.
@@ -108,7 +111,7 @@ Alternatively, a YAML file that specifies the values for the above parameters
108111
can be provided while installing the chart. For example,
109112

110113
```console
111-
$ helm install --name my-release -f values.yaml deployment/chart
114+
$ helm install code-server ci/helm-chart -f values.yaml
112115
```
113116

114117
> **Tip**: You can use the default [values.yaml](values.yaml)

charts/code-server/values.yaml renamed to ci/helm-chart/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ persistence:
112112
##
113113
# storageClass: "-"
114114
accessMode: ReadWriteOnce
115-
size: 1Gi
115+
size: 10Gi
116116
annotations: {}
117117
# existingClaim: ""
118118
# hostPath: /data

ci/images/debian10/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,10 @@ ENV GO111MODULE=on
4545
RUN go get mvdan.cc/sh/v3/cmd/shfmt
4646
RUN go get github.com/goreleaser/nfpm/cmd/nfpm
4747

48+
RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" && \
49+
curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" > /usr/local/bin/kubectl \
50+
&& chmod +x /usr/local/bin/kubectl
51+
RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
52+
RUN helm plugin install https://github.com/instrumenta/helm-kubeval
53+
4854
RUN curl -fsSL https://get.docker.com | sh

doc/install.md

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- [macOS](#macos)
1313
- [Standalone Releases](#standalone-releases)
1414
- [Docker](#docker)
15+
- [helm](#helm)
1516

1617
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
1718

@@ -192,3 +193,7 @@ Our official image supports `amd64` and `arm64`.
192193
For `arm32` support there is a popular community maintained alternative:
193194

194195
https://hub.docker.com/r/linuxserver/code-server
196+
197+
## helm
198+
199+
See [the chart](../ci/helm-chart).

0 commit comments

Comments
 (0)