Skip to content
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

Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle #325

Merged
merged 2 commits into from Dec 13, 2019

Conversation

soltysh
Copy link
Member

@soltysh soltysh commented Dec 12, 2019

This was done based on openshift/cluster-kube-apiserver-operator#552

/assign @stlaz

@openshift-ci-robot
Copy link

@soltysh: This pull request references Bugzilla bug 1782819, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 12, 2019
@openshift-ci-robot
Copy link

@soltysh: This pull request references Bugzilla bug 1782819, which is valid.

In response to this:

Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 12, 2019
@soltysh soltysh changed the title Bug 1782819: Inject kube-controller-manager pods trust stores with trusted ca bundle Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle Dec 12, 2019
@openshift-ci-robot
Copy link

@soltysh: This pull request references Bugzilla bug 1772756, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@soltysh
Copy link
Member Author

soltysh commented Dec 12, 2019

/cherry-pick release-4.3

@openshift-cherrypick-robot

@soltysh: once the present PR merges, I will cherry-pick it on top of release-4.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@stlaz
Copy link
Member

stlaz commented Dec 12, 2019

I think this tries to pass

    - -v=2
    - --tls-cert-file=/etc/kubernetes/static-pod-resources/secrets/serving-cert/tls.crt
    - --tls-private-key-file=/etc/kubernetes/static-pod-resources/secrets/serving-cert/tls.key

to bash, this is what the full container spec looks like:

containers:
  - args:
    - |
      if [ -f /etc/kubernetes/static-pod-certs/configmaps/trusted-ca-bundle/ca-bundle.crt ]; then
        echo "Copying system trust bundle"
        cp -f /etc/kubernetes/static-pod-certs/configmaps/trusted-ca-bundle/ca-bundle.crt /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
      fi
      exec hyperkube kube-controller-manager --openshift-config=/etc/kubernetes/static-pod-resources/configmaps/config/config.yaml \
        --kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/controller-manager-kubeconfig/kubeconfig \
        --authentication-kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/controller-manager-kubeconfig/kubeconfig \
        --authorization-kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/controller-manager-kubeconfig/kubeconfig \
        --client-ca-file=/etc/kubernetes/static-pod-certs/configmaps/client-ca/ca-bundle.crt \
        --requestheader-client-ca-file=/etc/kubernetes/static-pod-certs/configmaps/aggregator-client-ca/ca-bundle.crt
    - -v=2
    - --tls-cert-file=/etc/kubernetes/static-pod-resources/secrets/serving-cert/tls.crt
    - --tls-private-key-file=/etc/kubernetes/static-pod-resources/secrets/serving-cert/tls.key
    command:
    - /bin/bash
    - -ec

@stlaz
Copy link
Member

stlaz commented Dec 13, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 13, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh, stlaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit bb2d933 into openshift:master Dec 13, 2019
@openshift-ci-robot
Copy link

@soltysh: All pull requests linked via external trackers have merged. Bugzilla bug 1772756 has been moved to the MODIFIED state.

In response to this:

Bug 1772756: Inject kube-controller-manager pods trust stores with trusted ca bundle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@soltysh: new pull request created: #328

In response to this:

/cherry-pick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@soltysh soltysh deleted the bug1782819 branch December 13, 2019 11:07
@sferich888
Copy link

/cherry-pick release-4.2

@openshift-cherrypick-robot

@sferich888: #325 failed to apply on top of branch "release-4.2":

Applying: Append log and tls flags based on new semantics
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/targetconfigcontroller/targetconfigcontroller.go
CONFLICT (content): Merge conflict in pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Patch failed at 0002 Append log and tls flags based on new semantics

In response to this:

/cherry-pick release-4.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants