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

fix: don't require app.kubernetes.io/instance:che label on k8s object to trigger a reconcile #1204

Merged
merged 2 commits into from
Nov 30, 2021

Conversation

tolusha
Copy link
Contributor

@tolusha tolusha commented Nov 30, 2021

Signed-off-by: Anatolii Bazko abazko@redhat.com

What does this PR do?

Fix for #1166 not to require app.kubernetes.io/instance:che label for k8s objects to trigger a reconcile

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

eclipse-che/che#20841

How to test this PR?

  1. Deploy Eclipse Che
chectl server:deploy \
     --installer operator \
     --platform minikube \
     --che-operator-image abazko/operator:20841
  1. Create config map
kubectl create configmap ca-certs -n eclipse-che
kubectl label configmap/ca-certs  app.kubernetes.io/part-of=che.eclipse.org app.kubernetes.io/component=ca-bundle -n eclipse-che 
  1. Check that configamp is included into ca-certs-merged
kubectl get configmap ca-certs-merged -n eclipse-che -o jsonpath="{.metadata.annotations}"

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@tolusha tolusha changed the title fix: don't require app.kubernetes.io/instance:che label fix: don't require app.kubernetes.io/instance:che label on k8s object to trigger a reconcile Nov 30, 2021
skipBackupObjectsRequirement, _ := labels.NewRequirement(deploy.KubernetesPartOfLabelKey, selection.NotEquals, []string{checlusterbackup.BackupCheEclipseOrg})

cheResourcesLabelSelector := labels.NewSelector().Add(*cheInstanceRequirement).Add(*cheNameRequirement).Add(*skipBackupObjectsRequirement)
cheResourcesLabelSelector := labels.NewSelector().Add(*cheNameRequirement).Add(*skipBackupObjectsRequirement)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should add part-of label requirement, shouldn't we?

Copy link
Contributor

Choose a reason for hiding this comment

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

Or even replace instance requirement...

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@openshift-ci
Copy link

openshift-ci bot commented Nov 30, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mmorhun, tolusha

The full list of commands accepted by this bot can be found 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

@mmorhun mmorhun assigned tolusha and unassigned mmorhun Nov 30, 2021
@openshift-ci
Copy link

openshift-ci bot commented Nov 30, 2021

@tolusha: 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/v7-single-host-nightly-deployment 621f04d link true /test v7-single-host-nightly-deployment
ci/prow/v7-devworkspace-happy-path 621f04d link true /test v7-devworkspace-happy-path

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

@tolusha tolusha merged commit 474b0c8 into main Nov 30, 2021
@tolusha tolusha deleted the 20841 branch November 30, 2021 13:39
@che-bot che-bot added this to the 7.40 milestone Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants