Skip to content

defaultconfig: add --cert-dir in preparation of 1.13 #202

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.

Sign up for GitHub

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

Closed
sttts wants to merge 2 commits into from
Closed

defaultconfig: add --cert-dir in preparation of 1.13 #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1d48f3
Revert "disable kcm secure serving"
sttts Mar 26, 2019
3e2a8fa
defaultconfig: set cert dir in 1.13 preparation
sttts Mar 26, 2019
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
4 changes: 2 additions & 2 deletions bindata/bootkube/bootstrap-manifests/kube-controller-manager-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ spec:
readOnly: true
livenessProbe:
httpGet:
scheme: HTTP
port: 10252
scheme: HTTPS
port: 10257
path: healthz
initialDelaySeconds: 45
timeoutSeconds: 10
Expand Down
4 changes: 4 additions & 0 deletions bindata/bootkube/config/bootstrap-config-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ extendedArguments:
- "/etc/kubernetes/secrets/kubelet-signer.crt"
cluster-signing-key-file:
- "/etc/kubernetes/secrets/kubelet-signer.key"
secure-port:

@deads2k deads2k Mar 26, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we bother to override this to the same value?

@sttts sttts Mar 26, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just reverted.

@soltysh soltysh Mar 26, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I understood @deads2k we don't need that bit at all.

- "10257"
port:
- "0"
{{if .ClusterCIDR }}
cluster-cidr: {{range .ClusterCIDR}}
- {{.}}{{end}}
Expand Down
6 changes: 4 additions & 2 deletions bindata/v3.11.0/kube-controller-manager/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: kubecontrolplane.config.openshift.io/v1
kind: KubeControllerManagerConfig
extendedArguments:
cert-dir:
- "/var/run/kubernetes"
enable-dynamic-provisioning:
- "true"
allocate-node-cidrs:
Expand Down Expand Up @@ -33,9 +35,9 @@ extendedArguments:
experimental-cluster-signing-duration:
- "720h"
secure-port:
- "0"
- "10257"
port:
- "10252"
- "0"
root-ca-file:
- "/etc/kubernetes/static-pod-resources/configmaps/serviceaccount-ca/ca-bundle.crt"
service-account-private-key-file:
Expand Down
8 changes: 4 additions & 4 deletions bindata/v3.11.0/kube-controller-manager/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ spec:
name: resource-dir
livenessProbe:
httpGet:
scheme: HTTP
port: 10252
scheme: HTTPS
port: 10257
path: healthz
initialDelaySeconds: 45
timeoutSeconds: 10
readinessProbe:
httpGet:
scheme: HTTP
port: 10252
scheme: HTTPS
port: 10257
path: healthz
initialDelaySeconds: 10
timeoutSeconds: 10
Expand Down
14 changes: 8 additions & 6 deletions pkg/operator/v311_00_assets/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.