Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-trusted-ca bundle #140

lobziik · 2021-10-26T14:26:18Z

Additional trusted CA from cloud-config should also be counted during
ccm-trusted-ca sync procedure. Due to OCP installer nuances,
'additionalTrustBundle' not always ends up in the proxy object.

For handling such situation this patch introduces support of 'ca-bundle.pem'
key in cloud-config. CA from there will be added to ccm-trusted-ca along with
additional CA bundle which reffered by proxy object.

For additional context see:
openshift/installer#5251 (comment)

…ests Test for cloud-conf sync controller was extended for ensure that all keys are handled and synced

openshift-ci · 2021-10-26T14:26:22Z

@lobziik: This pull request references Bugzilla bug 2015493, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 2015493: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-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.

lobziik · 2021-10-26T14:26:48Z

/cc @JoelSpeed @Fedosin @elmiko

lobziik · 2021-10-26T15:04:04Z

/test unit

JoelSpeed

One stylistic nit otherwise I think this looks good

pkg/controllers/trusted_ca_bundle_controller.go

elmiko

couple of nits in the documentation, otherwise lgtm

docs/dev/trusted_ca_bundle_sync.md

lobziik · 2021-10-27T11:04:52Z

/test e2e-aws-ccm-install
/test e2e-aws-ccm

elmiko

thanks Denis
/approve

elmiko · 2021-10-27T13:49:28Z

seems like the unit tests broke

lobziik · 2021-10-27T16:41:08Z

Apparently we need to count on missed cloud config as on expected situation.
Changed code accordingly.

Also unit-tests are not stable, there is some cleanup issues, didn't figure out why exactly this happen.
Wanna hold it, till i will fix up units.
/hold
/remove-approve

openshift-ci · 2021-10-27T16:41:48Z

@lobziik: This pull request references Bugzilla bug 2017565, 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.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.0) matches configured target release for branch (4.10.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

Details

In response to this:

Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-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.

elmiko · 2021-10-27T21:49:15Z

no worries, thanks for the extra detail @lobziik
/approve cancel

lobziik · 2021-11-01T15:03:25Z

I fixed tests in 494fc0b
/hold cancel

lobziik · 2021-11-01T16:01:10Z

/retest

elmiko

thanks Denis
/approve

pkg/controllers/cloud_config_sync_controller_test.go

JoelSpeed · 2021-11-02T11:50:35Z

pkg/controllers/cloud_config_sync_controller_test.go

+		allCMs := &corev1.ConfigMapList{}
+		Expect(cl.List(ctx, allCMs)).To(Succeed())
+		for _, cm := range allCMs.Items {
+			Expect(cl.Delete(ctx, &cm, deleteOptions)).To(Succeed())
 			Eventually(
-				apierrors.IsNotFound(cl.Get(ctx, client.ObjectKeyFromObject(managedCloudConfig), &corev1.ConfigMap{})),
-			).Should(BeTrue())
-		}
-
-		if syncedCloudConfigMap != nil {
-			Expect(cl.Delete(ctx, syncedCloudConfigMap, deleteOptions)).To(Succeed())
-			Eventually(
-				apierrors.IsNotFound(cl.Get(ctx, client.ObjectKeyFromObject(syncedCloudConfigMap), &corev1.Namespace{})),
+				apierrors.IsNotFound(cl.Get(ctx, client.ObjectKeyFromObject(&cm), &corev1.ConfigMap{})),


As mentioned in slack, but for the benefit or future selves. You could also use a DeleteAllOf call here, which will delete all of the configmaps in a particular namespace. For example this could be done:

By("Cleanup resources") for _, ns := range []string{targetNamespaceName, OpenshiftConfigNamespace, OpenshiftManagedConfigNamespace} { Expect(cl.DeleteAllOf(ctx, &corev1.ConfigMap{}, client.GracePeriodSeconds(0), client.InNamespace(ns), )).To(Succeed()) Eventually(func() (bool, error) { cmList := &corev1.ConfigMapList{} if err := cl.List(ctx, cmList, client.InNamespace(ns)); err != nil { return false, err } return len(cmList.Items) == 0, nil }, ).Should(BeTrue()) }

lobziik · 2021-11-03T12:47:40Z

I squashed commits and cleaned up tests for cloud-conf syncer a bit, IMHO it's ready for final review.
@JoelSpeed @Fedosin @elmiko PTAL

JoelSpeed

One nit, I don't think it makes too much difference here but could cause a bug down the line if you were to create a list from within the loop or something

pkg/controllers/cloud_config_sync_controller_test.go

lobziik · 2021-11-03T16:11:05Z

/retest

Additional trusted CA from cloud-config should also be counted during ccm-trusted-ca sync procedure. Due to OCP installer nuances, 'additionalTrustBundle' not always ends up in the proxy object. For handling such situation this patch introduces support of 'ca-bundle.pem' key in cloud-config. CA from there will be added to ccm-trusted-ca along with additional CA bundle which reffered by proxy object. However, cloud-config might not be always presented. On some platforms (AWS), there might be no cloud-config at all. So, missed cloud config does not considering as an error. For additional context see: openshift/installer#5251 (comment)

openshift-ci · 2021-11-03T19:12:30Z

@lobziik: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-gcp-ccm	`372db61`	link	false	`/test e2e-gcp-ccm`
ci/prow/e2e-gcp-ccm-install	`372db61`	link	false	`/test e2e-gcp-ccm-install`
ci/prow/e2e-vsphere-ccm	`372db61`	link	false	`/test e2e-vsphere-ccm`
ci/prow/e2e-vsphere-ccm-install	`372db61`	link	false	`/test e2e-vsphere-ccm-install`
ci/prow/e2e-openstack-ccm	`372db61`	link	false	`/test e2e-openstack-ccm`
ci/prow/e2e-azure-upgrade	`372db61`	link	false	`/test e2e-azure-upgrade`
ci/prow/e2e-azure	`372db61`	link	false	`/test e2e-azure`
ci/prow/e2e-azure-ccm	`372db61`	link	false	`/test e2e-azure-ccm`

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

lobziik · 2021-11-04T12:22:38Z

/test e2e-aws-ccm

Fedosin

/lgtm

openshift-ci · 2021-11-04T16:13:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko, Fedosin

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [Fedosin,elmiko]

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

openshift-ci · 2021-11-04T16:15:06Z

@lobziik: All pull requests linked via external trackers have merged:

openshift/cluster-cloud-controller-manager-operator#140

Bugzilla bug 2017565 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-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.

Extract 'cloudConfigMapName' constant to common consts file, extend t…

b1632f4

…ests Test for cloud-conf sync controller was extended for ensure that all keys are handled and synced

openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Oct 26, 2021

openshift-ci bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Oct 26, 2021

openshift-ci bot requested review from Fedosin, JoelSpeed and elmiko October 26, 2021 14:29

JoelSpeed reviewed Oct 26, 2021

View reviewed changes

pkg/controllers/trusted_ca_bundle_controller.go Outdated Show resolved Hide resolved

elmiko reviewed Oct 26, 2021

View reviewed changes

docs/dev/trusted_ca_bundle_sync.md Outdated Show resolved Hide resolved

docs/dev/trusted_ca_bundle_sync.md Outdated Show resolved Hide resolved

docs/dev/trusted_ca_bundle_sync.md Outdated Show resolved Hide resolved

elmiko reviewed Oct 27, 2021

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 27, 2021

lobziik changed the title ~~Bug 2015493: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-trusted-ca bundle~~ Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-trusted-ca bundle Oct 27, 2021

openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. and removed bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Oct 27, 2021

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Oct 27, 2021

openshift-ci bot requested a review from sunzhaohua2 October 27, 2021 16:41

openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 1, 2021

lobziik requested a review from elmiko November 1, 2021 16:28

lobziik requested a review from JoelSpeed November 1, 2021 16:28

elmiko reviewed Nov 1, 2021

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 1, 2021

JoelSpeed reviewed Nov 2, 2021

View reviewed changes

lobziik requested a review from JoelSpeed November 3, 2021 12:47

JoelSpeed reviewed Nov 3, 2021

View reviewed changes

pkg/controllers/cloud_config_sync_controller_test.go Outdated Show resolved Hide resolved

lobziik added 2 commits November 3, 2021 17:37

Update CA sync related doc part

372db61

lobziik requested a review from JoelSpeed November 3, 2021 17:04

Fedosin approved these changes Nov 4, 2021

View reviewed changes

openshift-ci bot assigned Fedosin Nov 4, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 4, 2021

openshift-merge-robot merged commit b87c310 into openshift:master Nov 4, 2021

lobziik mentioned this pull request Nov 8, 2021

[release-4.9] Bug 2015503: User CA bundle sync controller #138

Merged

Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-trusted-ca bundle #140

Bug 2017565: [OCPCLOUD-1306] Add user defined trusted CA from cloud-config to ccm-trusted-ca bundle #140

Uh oh!

Conversation

lobziik commented Oct 26, 2021

Uh oh!

openshift-ci bot commented Oct 26, 2021

Uh oh!

lobziik commented Oct 26, 2021

Uh oh!

lobziik commented Oct 26, 2021

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lobziik commented Oct 27, 2021

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

elmiko commented Oct 27, 2021

Uh oh!

lobziik commented Oct 27, 2021

Uh oh!

openshift-ci bot commented Oct 27, 2021

Uh oh!

elmiko commented Oct 27, 2021

Uh oh!

lobziik commented Nov 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lobziik commented Nov 1, 2021

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JoelSpeed Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

lobziik commented Nov 3, 2021

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lobziik commented Nov 3, 2021

Uh oh!

openshift-ci bot commented Nov 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lobziik commented Nov 4, 2021

Uh oh!

Fedosin left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Nov 4, 2021

Uh oh!

openshift-ci bot commented Nov 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lobziik commented Nov 1, 2021 •

edited

Loading

openshift-ci bot commented Nov 3, 2021 •

edited

Loading