OCPNODE-2098: Add static pod for kube-rbac-proxy-crio #4175
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| mode: 0644 | ||
| path: "/etc/kubernetes/crio-metrics-proxy.cfg" | ||
| contents: | ||
| inline: |- | ||
| authorization: | ||
| static: | ||
| - resourceRequest: false | ||
| path: /metrics | ||
| verb: get | ||
| user: | ||
| name: system:serviceaccount:openshift-monitoring:prometheus-k8s | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| mode: 0644 | ||
| path: "/etc/kubernetes/manifests/criometricsproxy.yaml" | ||
| contents: | ||
| inline: |- | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| name: kube-rbac-proxy-crio | ||
| namespace: openshift-machine-config-operator | ||
| spec: | ||
| volumes: | ||
| - name: etc-kube | ||
| hostPath: | ||
| path: "/etc/kubernetes" | ||
| - name: var-lib-kubelet | ||
| hostPath: | ||
| path: "/var/lib/kubelet" | ||
| hostNetwork: true | ||
| priorityClassName: system-cluster-critical | ||
| initContainers: | ||
| - name: setup | ||
| terminationMessagePolicy: FallbackToLogsOnError | ||
| image: {{.Images.kubeRbacProxyImage}} | ||
| imagePullPolicy: IfNotPresent | ||
| volumeMounts: | ||
| - name: var-lib-kubelet | ||
| mountPath: "/var" | ||
| mountPropagation: HostToContainer | ||
| command: ['/bin/bash', '-ec'] | ||
| args: | ||
| - | | ||
| echo -n "Waiting for kubelet key and certificate to be available" | ||
| while [ -n "$(test -e /var/lib/kubelet/pki/kubelet-server-current.pem)" ] ; do | ||
| echo -n "." | ||
| sleep 1 | ||
| (( tries += 1 )) | ||
| if [[ "${tries}" -gt 10 ]]; then | ||
| echo "Timed out waiting for kubelet key and cert." | ||
| exit 1 | ||
| fi | ||
| done | ||
| securityContext: | ||
| privileged: true | ||
| resources: | ||
| requests: | ||
| memory: 50Mi | ||
| cpu: 5m | ||
| containers: | ||
| - name: kube-rbac-proxy-crio | ||
| image: {{.Images.kubeRbacProxyImage}} | ||
| securityContext: | ||
| privileged: true | ||
| ports: | ||
| - containerPort: 9637 | ||
| args: | ||
| - --secure-listen-address=:9637 | ||
|
There was a problem hiding this comment. any specific reason for this port? There was a problem hiding this comment. The usual port is 9537. To make it easier to identify the secure port I used 9637 (100 more than the insecure one). (9637 is not in use by the /etc/services file). |
||
| - --config-file=/etc/kubernetes/crio-metrics-proxy.cfg | ||
| - --client-ca-file=/etc/kubernetes/kubelet-ca.crt | ||
| - --logtostderr=true | ||
| - --kubeconfig=/var/lib/kubelet/kubeconfig | ||
| - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 | ||
| - --upstream=http://127.0.0.1:9537 | ||
| - --tls-cert-file=/var/lib/kubelet/pki/kubelet-server-current.pem | ||
| - --tls-private-key-file=/var/lib/kubelet/pki/kubelet-server-current.pem | ||
| resources: | ||
| requests: | ||
| cpu: 20m | ||
| memory: 50Mi | ||
| volumeMounts: | ||
| - name: etc-kube | ||
| mountPath: "/etc/kubernetes" | ||
| mountPropagation: HostToContainer | ||
| - name: var-lib-kubelet | ||
| mountPath: "/var/lib/kubelet" | ||
| mountPropagation: HostToContainer | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| mode: 0644 | ||
| mode: 0644 | ||
| path: "/etc/kubernetes/crio-metrics-proxy.cfg" | ||
| contents: | ||
| inline: |- | ||
| authorization: | ||
| static: | ||
| - resourceRequest: false | ||
| path: /metrics | ||
| verb: get | ||
| user: | ||
| name: system:serviceaccount:openshift-monitoring:prometheus-k8s |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| mode: 0644 | ||
| path: "/etc/kubernetes/manifests/criometricsproxy.yaml" | ||
| contents: | ||
| inline: |- | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| name: kube-rbac-proxy-crio | ||
| namespace: openshift-machine-config-operator | ||
| spec: | ||
| volumes: | ||
| - name: etc-kube | ||
| hostPath: | ||
| path: "/etc/kubernetes" | ||
| - name: var-lib-kubelet | ||
| hostPath: | ||
| path: "/var/lib/kubelet" | ||
| hostNetwork: true | ||
| priorityClassName: system-cluster-critical | ||
| initContainers: | ||
| - name: setup | ||
| terminationMessagePolicy: FallbackToLogsOnError | ||
| image: {{.Images.kubeRbacProxyImage}} | ||
| imagePullPolicy: IfNotPresent | ||
| volumeMounts: | ||
| - name: var-lib-kubelet | ||
| mountPath: "/var" | ||
| mountPropagation: HostToContainer | ||
| command: ['/bin/bash', '-ec'] | ||
| args: | ||
| - | | ||
| echo -n "Waiting for kubelet key and certificate to be available" | ||
| while [ -n "$(test -e /var/lib/kubelet/pki/kubelet-server-current.pem)" ] ; do | ||
| echo -n "." | ||
| sleep 1 | ||
| (( tries += 1 )) | ||
| if [[ "${tries}" -gt 10 ]]; then | ||
| echo "Timed out waiting for kubelet key and cert." | ||
| exit 1 | ||
| fi | ||
| done | ||
| securityContext: | ||
| privileged: true | ||
| resources: | ||
| requests: | ||
| memory: 50Mi | ||
| cpu: 5m | ||
| containers: | ||
| - name: kube-rbac-proxy-crio | ||
| image: {{.Images.kubeRbacProxyImage}} | ||
| securityContext: | ||
| privileged: true | ||
| ports: | ||
| - containerPort: 9637 | ||
| args: | ||
| - --secure-listen-address=:9637 | ||
| - --config-file=/etc/kubernetes/crio-metrics-proxy.cfg | ||
| - --client-ca-file=/etc/kubernetes/kubelet-ca.crt | ||
| - --logtostderr=true | ||
| - --kubeconfig=/var/lib/kubelet/kubeconfig | ||
| - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 | ||
| - --upstream=http://127.0.0.1:9537 | ||
|
There was a problem hiding this comment. our kube-rbac-proxy ctrs usually use a different port, I am forgetting which. Should we mimic that here? There was a problem hiding this comment. The kube-rbac-proxy is exposing a host network port (9637) and forwarding to the host's 9537 port. I slightly deviated from the usual construct due to host networking. |
||
| - --tls-cert-file=/var/lib/kubelet/pki/kubelet-server-current.pem | ||
| - --tls-private-key-file=/var/lib/kubelet/pki/kubelet-server-current.pem | ||
| resources: | ||
| requests: | ||
| cpu: 20m | ||
| memory: 50Mi | ||
| volumeMounts: | ||
| - name: etc-kube | ||
| mountPath: "/etc/kubernetes" | ||
| mountPropagation: HostToContainer | ||
| - name: var-lib-kubelet | ||
| mountPath: "/var/lib/kubelet" | ||
| mountPropagation: HostToContainer | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this using the openshift-monitoring SA?
In our other kube-rbac-proxy pods we specify which
serviceAccountName:we want to use. Where is that happening in this PR?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This new kube-rbac-proxy-crio service does not have access to service account secrets due to being a static pod. Instead, we are using client side certificate validation and only allowing the
system:serviceaccount:openshift-monitoring:prometheus-k8suser.