Skip to content
This repository has been archived by the owner on Jun 22, 2021. It is now read-only.

Commit

Permalink
Move template-sync sidecar to datahub secrets
Browse files Browse the repository at this point in the history
We override `hub.extraContainers` in `secrets/staging.yaml`
and `secrets/prod.yaml` to include the fetch-course-emails
container along the hub. But this overrides what's in
`config/common.yaml` destructively, since it just replaces
the list rather than add to it.

I've filed jupyterhub/kubespawner#468
to fix this. Until then, I've manually moved the extraContainers
config to the secret files.
  • Loading branch information
yuvipanda committed Dec 14, 2020
1 parent d687129 commit 6a2e003
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jupyterhub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool
initContainers:
# There's another sidecar, specified in `secrets/staging.yaml` and `secrets/prod.yaml`
# that keeps this up to date. https://github.com/jupyterhub/kubespawner/issues/468
# should help us move that back here.
- name: templates-clone
image: alpine/git
args:
Expand All @@ -29,25 +32,6 @@ jupyterhub:
volumeMounts:
- name: custom-templates
mountPath: /srv/repo
extraContainers:
# Keep templates in sync, so you can autodeploy from master
- name: templates-sync
image: alpine/git
workingDir: /srv/repo
command:
- /bin/sh
args:
- -c
# Do git reset --hard origin/master so we aren't confused by force pushes
- "while true; do git fetch origin; git reset --hard origin/master; sleep\
\ 5m; done"
securityContext:
runAsUser: 1000
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
volumeMounts:
- name: custom-templates
mountPath: /srv/repo
extraVolumes:
- name: custom-templates
emptyDir: {}
Expand Down
Binary file modified deployments/datahub/secrets/prod.yaml
Binary file not shown.
Binary file modified deployments/datahub/secrets/staging.yaml
Binary file not shown.

0 comments on commit 6a2e003

Please sign in to comment.