Skip to content

Commit 92eae76

Browse files
committed
add proxy support for github-actions-runner
1 parent dd2606a commit 92eae76

File tree

10 files changed

+35
-13
lines changed

10 files changed

+35
-13
lines changed

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Helm
1515
uses: azure/setup-helm@v3
1616
with:
17-
version: v3.10.0
17+
version: v3.11.1
1818

1919
- name: Set up Python
2020
uses: actions/setup-python@v4

.github/workflows/release-charts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
- name: Set up Helm
2323
uses: azure/setup-helm@v3
2424
with:
25-
version: v3.10.0
25+
version: v3.11.1
2626

2727
- name: Configure Git
2828
run: |
2929
git config user.name "$GITHUB_ACTOR"
3030
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
3131
3232
- name: Run chart-releaser
33-
uses: helm/chart-releaser-action@v1.4.1
33+
uses: helm/chart-releaser-action@v1.5.0
3434
env:
3535
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Helm's [documentation](https://helm.sh/docs) to get started.
77

88
Once Helm has been set up correctly, add the repo as follows:
99

10-
helm repo add fs-devops http://fullstack-devops.github.io/helm-charts/
10+
helm repo add fs-devops https://fullstack-devops.github.io/helm-charts/
1111

1212
If you had already added this repo earlier, run `helm repo update` to retrieve
1313
the latest versions of the packages. You can then run `helm search repo fsops` to see the charts.
@@ -20,13 +20,23 @@ To uninstall the chart:
2020

2121
helm delete my-<chart-name>
2222

23-
### charts
23+
## Charts
2424

2525
| Name | Description | Docs |
2626
| --------------------- | ------------------------------- | ---------------------------------------------- |
2727
| excalidraw | Chart for excalidraw | [link](charts/excalidraw/README.md) |
2828
| github-actions-runner | Chart for github-actions-runner | [link](charts/github-actions-runner/README.md) |
2929

30+
31+
## Dev
32+
33+
### helm-docs
34+
35+
```bash
36+
go install github.com/norwoodj/helm-docs/cmd/helm-docs@latest
37+
helm-docs -t templates/README.md.gotmpl
38+
```
39+
3040
### Pre-commit hook
3141

3242
If you want to automatically generate `README.md` files with a pre-commit hook, make sure you

charts/excalidraw/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes
44

55
type: application
66

7-
version: 0.2.8
7+
version: 0.2.9
88
appVersion: 0.0.7
99

1010
kubeVersion: ">=1.19.0"

charts/excalidraw/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# excalidraw
22

3-
![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.7](https://img.shields.io/badge/AppVersion-0.0.7-informational?style=flat-square)
3+
![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.7](https://img.shields.io/badge/AppVersion-0.0.7-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -107,5 +107,3 @@ helm install excalidraw fs-devops/excalidraw -f values.yaml
107107
| serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template |
108108
| tolerations | list | `[]` | |
109109

110-
----------------------------------------------
111-
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/github-actions-runner/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes
44

55
type: application
66

7-
version: 0.6.7
7+
version: 0.7.0
88
appVersion: 0.13.0
99

1010
kubeVersion: ">=1.19.0"

charts/github-actions-runner/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github-actions-runner
22

3-
![Version: 0.6.7](https://img.shields.io/badge/Version-0.6.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
3+
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
44

55
A Helm chart for Kubernetes
66

@@ -96,10 +96,14 @@ helm install github-actions-runner fs-devops/github-actions-runner -f values.yam
9696
| runner.github.enterpriseUrl | string | `""` | |
9797
| runner.github.organisation | string | `"fullstack-devpos"` | |
9898
| runner.github.repository | string | `""` | |
99+
| runner.group | string | `""` | |
99100
| runner.kaniko.enabled | bool | `false` | |
100101
| runner.kaniko.image.repository | string | `""` | |
101102
| runner.kaniko.mountedSecret | string | `""` | |
102103
| runner.labels | string | `""` | |
104+
| runner.proxy.enabled | bool | `false` | |
105+
| runner.proxy.ntmlCreds | string | `""` | |
106+
| runner.proxy.pacUrl | string | `""` | |
103107
| securityContext.readOnlyRootFilesystem | bool | `false` | |
104108
| securityContext.runAsNonRoot | bool | `true` | |
105109
| securityContext.runAsUser | int | `1000` | |
@@ -108,5 +112,3 @@ helm install github-actions-runner fs-devops/github-actions-runner -f values.yam
108112
| serviceAccount.name | string | `""` | |
109113
| tolerations | list | `[]` | |
110114

111-
----------------------------------------------
112-
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/github-actions-runner/templates/configmap-env.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ data:
1919
{{- if .Values.runner.labels }}
2020
GH_RUNNER_LABELS: {{ .Values.runner.labels | squote }}
2121
{{- end }}
22+
{{- if .Values.runner.group }}
23+
GH_RUNNER_GROUP: {{ .Values.runner.group | squote }}
24+
{{- end }}
2225

charts/github-actions-runner/templates/secrets.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ metadata:
77
type: Opaque
88
data:
99
GH_ACCESS_TOKEN: {{ .Values.runner.github.accessToken | b64enc | squote }}
10+
{{- if .Values.proxy.enabled }}
11+
PROXY_PAC: {{ .Values.proxy.pacUrl | b64enc | squote }}
12+
PROXY_NTLM_CREDENTIALS: {{ .Values.proxy.ntmlCreds | b64enc | squote }}
13+
{{- end }}

charts/github-actions-runner/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ runner:
1818
# -- if override: true -> the runner.flavor will be ignored and image.repository and image.tag will be leading
1919
override: false
2020
labels: ""
21+
group: ""
2122
# -- inject the runner custom env variables
2223
env:
2324
[]
@@ -35,6 +36,10 @@ runner:
3536
organisation: "fullstack-devpos"
3637
repository: ""
3738
accessToken: ""
39+
proxy:
40+
enabled: false
41+
pacUrl: ""
42+
ntmlCreds: ""
3843
# custom certs will be used in the runner and kaniko, as well in java (if you using it)
3944
customCerts:
4045
# Paste your custom ca-certificates.crt:

0 commit comments

Comments
 (0)