-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
OCPBUGS-29067: Update MCS Cert and Key files within bootstrap Ignition with UserProvisionedDNS #9238
Conversation
/test ? |
@sadasu: The following commands are available to trigger required jobs:
The following commands are available to trigger optional jobs:
Use
In response to this:
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-sigs/prow repository. |
/test e2e-gcp-user-provisioned-dns |
bb48726
to
ded76e0
Compare
@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this: 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 openshift-eng/jira-lifecycle-plugin repository. |
/jira refresh |
@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
@sadasu: This pull request references Jira Issue OCPBUGS-29067, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
ded76e0
to
35fdbbf
Compare
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.
/approve
if err != nil { | ||
return fmt.Errorf("failed to marshal MCS Cert: %w", err) | ||
} | ||
encoded := fmt.Sprintf("%s%s", replaceable, base64.StdEncoding.EncodeToString(mcsCertContents)) |
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.
nit: I wonder if we should make this into a function. Or better yet, figure out why the ignition encoding gets the charset but simple encoding does not I do not think this should hold up the Pr though.
/test e2e-gcp-user-provisioned-dns |
35fdbbf
to
38c4c9c
Compare
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: barbacbd 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 |
38c4c9c
to
f11a60e
Compare
/test e2e-gcp-user-provisioned-dns |
|
||
rawDecodedText, err := base64.StdEncoding.DecodeString(replaced) | ||
contents := strings.Split(*config.Storage.Files[i].Contents.Source, ",") | ||
rawDecodedText, err := base64.StdEncoding.DecodeString(contents[1]) |
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.
Prefer rawDecodedText, err := dataurl.DecodeString(*fileData.Contents.Source)
@@ -128,7 +128,7 @@ func addLoadBalancersToInfra(platform string, config *igntypes.Config, publicLBs | |||
return fmt.Errorf("failed to marshal infrastructure: %w", err) | |||
} | |||
|
|||
encoded := fmt.Sprintf("%s%s", replaceable, base64.StdEncoding.EncodeToString(infraContents)) | |||
encoded := fmt.Sprintf("%s%s", header, base64.StdEncoding.EncodeToString(infraContents)) |
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.
Prefer encoded := dataurl.EncodeBytes(infraContents)
/retest-required |
/test e2e-gcp-user-provisioned-dns |
/hold |
When UserProvisineDNS is enabled, in addition to machine-config-server cert file, also update the individual cert and key files within the bootstrap Ignition.
f11a60e
to
f7a2447
Compare
/hold cancel |
/test e2e-gcp-user-provisioned-dns |
/lgtm |
From serial logs from master nodes [obtained from
|
Also, from the same logs:
|
/cherry-pick release-4.18 |
@sadasu: once the present PR merges, I will cherry-pick it on top of In response to this:
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-sigs/prow repository. |
/testwith openshift/installer/main/e2e-gcp-user-provisioned-dns openshift/machine-config-operator#4367 |
@sadasu: The following tests failed, say
Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
/label acknowledge-critical-fixes-only |
c028d7c
into
openshift:main
@sadasu: Jira Issue OCPBUGS-29067: Some pull requests linked via external trackers have merged:
The following pull requests linked via external trackers have not merged: These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with Jira Issue OCPBUGS-29067 has not been moved to the MODIFIED state. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
@sadasu: new pull request created: #9348 In response to this:
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-sigs/prow repository. |
[ART PR BUILD NOTIFIER] Distgit: ose-installer-altinfra |
[ART PR BUILD NOTIFIER] Distgit: ose-baremetal-installer |
[ART PR BUILD NOTIFIER] Distgit: ose-installer-terraform-providers |
[ART PR BUILD NOTIFIER] Distgit: ose-installer-artifacts |
When UserProvisineDNS is enabled, the machine-config-server
cert is regenerated to respond to both the API-Int URL and API-Int LB IPs. This updated cert and key are added to
machine-config-server-tls-secret.yaml
within the bootstrap Ignition (as part of https://issues.redhat.com/browse/CORS-3709).This PR updates the individual machine-config-server cert and key files generated also in the bootstrap ignition.