Make helm template formatting follow best practices #1174
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
consideRatio
force-pushed
the
pr/modernize-template-formatting
branch
from
dcb2e65
to
0f717f2
Compare
|
I ran --- before.yaml 2020-10-29 13:45:19.000000000 +0100
+++ after.yaml 2020-10-29 13:45:32.000000000 +0100
@@ -1104,6 +1104,9 @@
metadata:
name: binder-config
data:
+ # FIXME: Stop splitting up parts into configmap/secret as it adds complexity,
+ # instead only use a secret. For the equivalent PR in z2jh, see:
+ # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/1682
values.yaml: |
config:
BinderHub:
@@ -1483,7 +1486,6 @@
labels: {}
spec:
type: NodePort
-
selector:
app: binder
name: binder
@@ -1548,7 +1550,7 @@
- name: IMAGE_GC_DELAY
value: "5"
- name: IMAGE_GC_THRESHOLD_TYPE
- value: relative
+ value: "relative"
- name: IMAGE_GC_THRESHOLD_HIGH
value: "80"
- name: IMAGE_GC_THRESHOLD_LOW
@@ -1852,13 +1854,11 @@
component: binder
release: RELEASE-NAME
heritage: Helm
-
annotations:
# This lets us autorestart when the configmap changes!
- checksum/config-map: ae0a43fd9e9d31da75751fbe6db89e48ba413df226cce43f853e55258ff9533d
+ checksum/config-map: 1c586d1a2901830eaccb36194aa1451e3eaba06538202254afb0e2d00e0b1141
checksum/secret: 958722d545be64139fadb4d84570157e6d4d430874e91e4a663c8dc880fbf84e
spec:
-
nodeSelector: {}
serviceAccountName: binderhub
volumes:
@@ -1871,7 +1871,6 @@
- name: docker-socket
hostPath:
path: /var/run/docker.sock
-
containers:
- name: binder
image: jupyterhub/k8s-binderhub:0.2.0-n246.h8c5b0c9
@@ -1885,11 +1884,10 @@
name: secret-config
- mountPath: /var/run/docker.sock
name: docker-socket
-
resources:
- requests:
- cpu: 0.2
- memory: 100Mi
+ requests:
+ cpu: 0.2
+ memory: 100Mi
imagePullPolicy: IfNotPresent
env:
- name: BUILD_NAMESPACE
@@ -1901,7 +1899,6 @@
secretKeyRef:
name: binder-secret
key: "binder.hub-token"
-
ports:
- containerPort: 8585
name: binderso everything looks right! |
minrk
reviewed
Oct 29, 2020
minrk
approved these changes
Oct 29, 2020
|
Thank you for the review @minrk! Good review idea to provide a diff like that! |
betatim
approved these changes
Oct 29, 2020
betatim
reviewed
Oct 29, 2020
yuvipanda
pushed a commit
to jupyterhub/helm-chart
that referenced
this pull request
Oct 29, 2020
|
The mybinder.org Line 72 is referenced in the kubeval output but I think that doesn't correspond to L72 in the |
consideRatio
commented
Oct 29, 2020
| {{- end }} | ||
| {{- with .Values.extraEnv }} | ||
| {{- . | toYaml | indent 8 }} |
There was a problem hiding this comment.
This is the error. It must be nindent
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is free from any changes to the logic or assumptions on the configuration, it only only adjusts formatting.