Bug 1834311: Fix trusted ca bundle and hash reconciliation

[periklis]

This PR addresses several issues on reconciliation of the trusted CA-Bundle config map as well the hash annotation on the Kibana deployment.

To address:

• https://bugzilla.redhat.com/show_bug.cgi?id=1834311
• https://bugzilla.redhat.com/show_bug.cgi?id=1833273

Needs backport to: release-4.4

[openshift-ci-robot]

@periklis: This pull request references Bugzilla bug 1833288, which is invalid:

• expected the bug to target the "4.5.0" release, but it targets "4.4.z" 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.

In response to this:

Bug 1833288: Fix trusted ca bundle and hash reconciliation

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]

@periklis: This pull request references Bugzilla bug 1834311, which is invalid:

• expected the bug to target the "4.5.0" release, but it targets "4.4.z" 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.

In response to this:

Bug 1834311: Fix trusted ca bundle and hash reconciliation

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]

@periklis: This pull request references Bugzilla bug 1834311, which is invalid:

• expected the bug to target the "4.5.0" release, but it targets "4.4.z" 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.

In response to this:

Bug 1834311: Fix trusted ca bundle and hash reconciliation

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.

[periklis]

/bugzilla refresh

[openshift-ci-robot]

@periklis: This pull request references Bugzilla bug 1834311, 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.5.0) matches configured target release for branch (4.5.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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.

[jcantrill]

/approve

[periklis]

/retest

[jcantrill]

/hold

[jcantrill]

/approve

[periklis]

/retest

[periklis]

/retest

[periklis]

/retest

[ewolinetz]

@periklis couple nits otherwise 👍

[jcantrill]

/approve

[ewolinetz]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ewolinetz, jcantrill, periklis

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:

• OWNERS [ewolinetz,jcantrill]

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

[periklis]

/retest

[periklis]

/hold cancel

[openshift-ci-robot]

@periklis: All pull requests linked via external trackers have merged: openshift/cluster-logging-operator#517, openshift/elasticsearch-operator#351. Bugzilla bug 1834311 has been moved to the MODIFIED state.

In response to this:

Bug 1834311: Fix trusted ca bundle and hash reconciliation

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.

[periklis]

/cherry-pick release-4.4

[openshift-cherrypick-robot]

@periklis: #351 failed to apply on top of branch "release-4.4":

Using index info to reconstruct a base tree...
A	pkg/controller/proxyconfig/controller.go
A	pkg/controller/trustedcabundle/controller.go
A	pkg/k8shandler/kibana/configmap.go
A	pkg/k8shandler/kibana/kibana_test.go
A	pkg/k8shandler/kibana/reconciler.go
A	pkg/k8shandler/kibana/trustedcabundle.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/k8shandler/kibana/trustedcabundle.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/k8shandler/kibana/trustedcabundle.go left in tree.
CONFLICT (modify/delete): pkg/k8shandler/kibana/reconciler.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/k8shandler/kibana/reconciler.go left in tree.
CONFLICT (modify/delete): pkg/k8shandler/kibana/kibana_test.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/k8shandler/kibana/kibana_test.go left in tree.
CONFLICT (modify/delete): pkg/k8shandler/kibana/configmap.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/k8shandler/kibana/configmap.go left in tree.
CONFLICT (modify/delete): pkg/controller/trustedcabundle/controller.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/controller/trustedcabundle/controller.go left in tree.
CONFLICT (modify/delete): pkg/controller/proxyconfig/controller.go deleted in HEAD and modified in Bug 1834311: Fix trusted ca bundle and hash reconciliation. Version Bug 1834311: Fix trusted ca bundle and hash reconciliation of pkg/controller/proxyconfig/controller.go left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 Bug 1834311: Fix trusted ca bundle and hash reconciliation

In response to this:

/cherry-pick release-4.4

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.