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

AUTH-442: add ClusterFleetEvaluation type to status controller #1634

Conversation

ibihim
Copy link
Contributor

@ibihim ibihim commented Nov 29, 2023

What

Add ClusterFleetEvaluationType to status controller.

Why

It is a valid ClusterOperator status, but doesn't have a mechanism to be pulled from Operator's status into ClusterOperator's status.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 29, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 29, 2023

@ibihim: This pull request references AUTH-442 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.15.0" version, but no target version was set.

In response to this:

What

Add ClusterFleetEvaluationType to status controller.

Why

It is a valid ClusterOperator status, but doesn't have a mechanism to be pulled from Operator's status into ClusterOperator's status.

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.

Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

One little nit, but looks good to me overall

configv1helpers.SetStatusCondition(&clusterOperatorObj.Status.Conditions, UnionClusterCondition("Progressing", operatorv1.ConditionFalse, nil, currentDetailedStatus.Conditions...))
configv1helpers.SetStatusCondition(&clusterOperatorObj.Status.Conditions, UnionClusterCondition("Available", operatorv1.ConditionTrue, nil, currentDetailedStatus.Conditions...))
configv1helpers.SetStatusCondition(&clusterOperatorObj.Status.Conditions, UnionClusterCondition("Upgradeable", operatorv1.ConditionTrue, nil, currentDetailedStatus.Conditions...))
configv1helpers.SetStatusCondition(&clusterOperatorObj.Status.Conditions, UnionClusterCondition(string(configv1.OperatorDegraded), operatorv1.ConditionFalse, c.degradedInertia, currentDetailedStatus.Conditions...))
Copy link
Member

Choose a reason for hiding this comment

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

Instead of casting everytime, we could change the signature of the UnionClusterCondition function and cast there. We should only change the signature of the cluster one because the cluster operator condition is typed (https://github.com/openshift/api/blob/a782d1c1541ca8ae0fd17fff5f1dc8a8990dc195/config/v1/types_cluster_operator.go#L122) which is the not the case of the operator condition: https://github.com/openshift/api/blob/master/operator/v1/types.go#L165

(no clue why that is the case 🤷‍♂️)

@stlaz
Copy link
Member

stlaz commented Nov 30, 2023

/hold
What's the first commit from Steve?
Join the bump and vendor commits to a single one

@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 Nov 30, 2023
@ibihim ibihim force-pushed the AUTH-442_psa_cluster-fleet-evaluation_add-evalution-condition branch 2 times, most recently from 5c241e1 to 1176113 Compare November 30, 2023 09:39
@ibihim ibihim force-pushed the AUTH-442_psa_cluster-fleet-evaluation_add-evalution-condition branch from 1176113 to 05fdbe4 Compare November 30, 2023 09:41
@ibihim ibihim force-pushed the AUTH-442_psa_cluster-fleet-evaluation_add-evalution-condition branch from 05fdbe4 to 17f9e42 Compare November 30, 2023 09:44
Copy link
Contributor

openshift-ci bot commented Nov 30, 2023

@ibihim: all tests passed!

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.

Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2023
@stlaz
Copy link
Member

stlaz commented Nov 30, 2023

/hold cancel

@openshift-ci 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 30, 2023
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/approve

@mfojtik
Copy link
Member

mfojtik commented Nov 30, 2023

/approve

Copy link
Contributor

openshift-ci bot commented Nov 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, ibihim, mfojtik, soltysh

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 Nov 30, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 2285c05 into openshift:master Nov 30, 2023
4 checks passed
@ibihim ibihim deleted the AUTH-442_psa_cluster-fleet-evaluation_add-evalution-condition branch November 30, 2023 12:44
@ibihim
Copy link
Contributor Author

ibihim commented Dec 12, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot

@ibihim: #1634 failed to apply on top of branch "release-4.14":

Applying: go*: bump openshift/api
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/github.com/openshift/api/Dockerfile.rhel8
M	vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-CustomNoUpgrade.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
M	vendor/github.com/openshift/api/config/v1/feature_gates.go
M	vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml
M	vendor/github.com/openshift/api/config/v1/types_cluster_version.go
M	vendor/github.com/openshift/api/config/v1/types_feature.go
M	vendor/github.com/openshift/api/config/v1/types_infrastructure.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go.git/rebase-apply/patch:10628: trailing whitespace.
    initial: | 
.git/rebase-apply/patch:10653: trailing whitespace.
      spec: 
.git/rebase-apply/patch:10679: trailing whitespace.
      spec: 
warning: 3 lines add whitespace errors.

M	vendor/github.com/openshift/api/machine/v1/0000_10_controlplanemachineset.crd.yaml
M	vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go
M	vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/openshiftcontrolplane/v1/types.go
M	vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/stable.ingresscontroller.testsuite.yaml
M	vendor/github.com/openshift/api/operator/v1/stable.network.testsuite.yaml
M	vendor/github.com/openshift/api/operator/v1/types_ingress.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_network.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/operator/v1/stable.network.testsuite.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/stable.network.testsuite.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
Auto-merging vendor/github.com/openshift/api/openshiftcontrolplane/v1/types.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/openshiftcontrolplane/v1/types.go
Auto-merging vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go
Auto-merging vendor/github.com/openshift/api/machine/v1/0000_10_controlplanemachineset-Default.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_infrastructure.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_infrastructure.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_feature.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_feature.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_cluster_version.go
Auto-merging vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/feature_gates.go
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-CustomNoUpgrade.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-CustomNoUpgrade.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
CONFLICT (modify/delete): vendor/github.com/openshift/api/Dockerfile.rhel8 deleted in HEAD and modified in go*: bump openshift/api. Version go*: bump openshift/api of vendor/github.com/openshift/api/Dockerfile.rhel8 left in tree.
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 go*: bump openshift/api
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants