Skip to content

helm: add certs secret mount #4641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Dec 7, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve: conflict
  • Loading branch information
ericpaulsen committed Dec 7, 2022
commit 479006bb10715fa42fe6f2a74baffe5a43c56dc4
4 changes: 1 addition & 3 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ coder:
# cpu: 100m
# memory: 128Mi

<<<<<<< HEAD
# coder.certs -- CA bundles to mount inside the Coder pod.
certs:
# coder.certs.secrets -- A list of CA bundle secrets to mount into the Coder
Expand All @@ -82,7 +81,7 @@ coder:
secrets: []
# - name: "my-ca-bundle"
# key: "ca-bundle.crt"
=======

# coder.affinity -- Allows specifying an affinity rule for the `coder` deployment.
# The default rule prefers to schedule coder pods on different
# nodes, which is only applicable if coder.replicaCount is greater than 1.
Expand Down Expand Up @@ -111,7 +110,6 @@ coder:
# See: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
nodeSelector: {}
# kubernetes.io/os: linux
>>>>>>> main

# coder.service -- The Service object to expose for Coder.
service:
Expand Down