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

MON-3846: create separate kubelet-serving-ca cm for metrics-server #2333

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

slashpai
Copy link
Member

@slashpai slashpai commented Apr 27, 2024

This is to avoid similar situation like https://issues.redhat.com/browse/OCPBUGS-32510 so that metrics-server
doesn't need to wait for prometheus task to create the configmap

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

cc: @machine424 @simonpasquier @jan--f

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 27, 2024

@slashpai: This pull request references MON-3846 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

cc: @machine424 @simonpasquier @jan--f

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 27, 2024
Copy link
Contributor

openshift-ci bot commented Apr 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: slashpai

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 27, 2024

@slashpai: This pull request references MON-3846 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

This is to avoid similar situation like https://issues.redhat.com/browse/OCPBUGS-32510 so that metrics-server
doesn't need to wait for prometheus task to create the configmap

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

cc: @machine424 @simonpasquier @jan--f

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.

@slashpai
Copy link
Member Author

/retest-required

@slashpai
Copy link
Member Author

slashpai commented May 6, 2024

/hold
let's revisit this later after temporary fix #2334

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 6, 2024
@slashpai
Copy link
Member Author

@machine424 what do you think about proceeding with this or do we want to wait?

@@ -106,17 +106,19 @@ func (t *MetricsServerTask) create(ctx context.Context) error {
return fmt.Errorf("reconciling MetricsServer Service failed: %w", err)
}

cacm, err := t.factory.PrometheusK8sKubeletServingCABundle(map[string]string{})
kscm, err := t.client.GetConfigmap(ctx, "openshift-config-managed", "kubelet-serving-ca")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the bundle isn't nominative (like the client certificate), the optimal setup would be to have a unique configmap created by a task from the first stage (like NewMetricsClientCATask or something similar).
However, for now, let's just add some comments here + around

kscm, err := t.client.GetConfigmap(ctx, "openshift-config-managed", "kubelet-serving-ca")
and around the two jsonnet resources, warning about the "duplication", to help avoid divergence between the two setups.

Copy link
Contributor

openshift-ci bot commented Jul 1, 2024

@slashpai: The following test 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-hypershift-conformance a626917 link true /test e2e-hypershift-conformance

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.

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants