Skip to content

Commit

Permalink
Consolidate usage of actionsRunnerImagePullSecretName
Browse files Browse the repository at this point in the history
  • Loading branch information
fgalind1 committed Dec 13, 2021
1 parent 2d62544 commit 944c8aa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions charts/actions-runner-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
| `image.repository` | The "repository/image" of the controller container | summerwind/actions-runner-controller |
| `image.tag` | The tag of the controller container | |
| `image.actionsRunnerRepositoryAndTag` | The "repository/image" of the actions runner container | summerwind/actions-runner:latest |
| `image.actionsRunnerImagePullSecret` | The image pull secret to be included in the runner pod's ImagePullSecrets |
| `image.actionsRunnerImagePullSecretName` | The image pull secret to be included in the runner pod's ImagePullSecrets |
| `image.dindSidecarRepositoryAndTag` | The "repository/image" of the dind sidecar container | docker:dind |
| `image.pullPolicy` | The pull policy of the controller image | IfNotPresent | |
| `image.pullPolicy` | The pull policy of the controller image | IfNotPresent |
| `metrics.serviceMonitor` | Deploy serviceMonitor kind for for use with prometheus-operator CRDs | false |
| `metrics.port` | Set port of metrics service | 8443 |
| `metrics.proxy.enabled` | Deploy kube-rbac-proxy container in controller pod | true |
Expand Down
4 changes: 2 additions & 2 deletions charts/actions-runner-controller/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ spec:
- "--sync-period={{ .Values.syncPeriod }}"
- "--docker-image={{ .Values.image.dindSidecarRepositoryAndTag }}"
- "--runner-image={{ .Values.image.actionsRunnerRepositoryAndTag }}"
{{- if .Values.image.actionsRunnerPullImageSecretName }}
- "--runner-image-pull-secret-name={{ .Values.image.actionsRunnerPullImageSecretName }}"
{{- if .Values.image.actionsRunnerImagePullSecretName }}
- "--runner-image-pull-secret-name={{ .Values.image.actionsRunnerImagePullSecretName }}"
{{- end }}
{{- if .Values.dockerRegistryMirror }}
- "--docker-registry-mirror={{ .Values.dockerRegistryMirror }}"
Expand Down
4 changes: 2 additions & 2 deletions charts/actions-runner-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ authSecret:
# Optionally create additional secrets required for your deployments
extraSecrets: []
# When using private docker registries to host your runner images you could use the following and
# include the secret in image.actionsRunnerImagePullSecret
# include the secret in image.actionsRunnerImagePullSecretName
# extraSecrets:
# - name: "github-actions-runner-image-pull-secret"
# type: "kubernetes.io/dockerconfigjson"
Expand All @@ -59,7 +59,7 @@ image:
pullPolicy: IfNotPresent
# The default image-pull secret name for self-hosted runner container.
# It's added to spec.ImagePullSecrets of self-hosted runner pods.
# actionsRunnerImagePullSecret: github-actions-runner-image-pull-secret
# actionsRunnerImagePullSecretName: github-actions-runner-image-pull-secret

imagePullSecrets: []
nameOverride: ""
Expand Down

0 comments on commit 944c8aa

Please sign in to comment.