Skip to content

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented Feb 20, 2025

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from d295155 to d316d8f Compare February 20, 2025 15:37
@anik120 anik120 changed the title Watch for new upstream feature gate APIV1MetasHandler OPRUN-3690: Watch for new upstream feature gate APIV1MetasHandler Feb 20, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 20, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 20, 2025

@anik120: This pull request references OPRUN-3690 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.19.0" version, but no target version was set.

In response to this:

  • refer:
  1. [Metas Endpoint RFC] (https://docs.google.com/document/d/1s6_9IFEKGQLNh3ueH7SF4Yrx4PW9NSiNFqFIJx0pU-8/edit?usp=sharing)
  2. operator-framework/operator-controller-1643
  3. operator-framework/operator-controller-1713

$ go get github.com/openshift/api@744790f2cff777b1bb29bdccce10e4e84cff0a69 $ go mod tidy
$ go mod vendor
Also needed
$ go get openshift/client-go@f7ec47e

to resolve vendoring inconsistency.

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
Copy link

openshift-ci-robot commented Feb 20, 2025

@anik120: This pull request references OPRUN-3690 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.19.0" version, but no target version was set.

In response to this:

  • refer:
  1. [Metas Endpoint RFC] (https://docs.google.com/document/d/1s6_9IFEKGQLNh3ueH7SF4Yrx4PW9NSiNFqFIJx0pU-8/edit?usp=sharing)
  2. operator-framework/operator-controller-1643
  3. operator-framework/operator-controller-1713

$ go get github.com/openshift/api@744790f2cff777b1bb29bdccce10e4e84cff0a69
$ go mod tidy
$ go mod vendor
Also needed
$ go get openshift/client-go@f7ec47e

to resolve vendoring inconsistency.

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.

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from d316d8f to e280153 Compare February 20, 2025 18:46
@anik120
Copy link
Contributor Author

anik120 commented Feb 24, 2025

Moving the dep updates to #105, will rebase this PR once 105 is merged.

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from e280153 to 057c82b Compare February 25, 2025 15:49
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 25, 2025

@anik120: This pull request references OPRUN-3690 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.19.0" version, but no target version was set.

In response to this:

refer:

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.

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from 057c82b to 6cd0f29 Compare February 25, 2025 18:04
@anik120
Copy link
Contributor Author

anik120 commented Feb 25, 2025

/test okd-scos-e2e-aws-ovn

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch 2 times, most recently from 7ffe803 to c154b70 Compare February 25, 2025 21:45
@anik120
Copy link
Contributor Author

anik120 commented Feb 25, 2025

/hold

cluster-bot failed to bring up a cluster with this PR with reason

msg=CatalogdDeploymentCatalogdControllerManagerDegraded: feature "NewOLMCatalogdAPIV1Metas" is not registered in FeatureGates [AWSClusterHostedDNS AWSEFSDriverVolumeMetrics AdditionalRoutingCapabilities AdminNetworkPolicy AlibabaPlatform AutomatedEtcdBackup AzureWorkloadIdentity BareMetalLoadBalancer BootcNodeManagement BuildCSIVolumes CSIDriverSharedResource ChunkSizeMiB CloudDualStackNodeIPs ClusterMonitoringConfig ConsolePluginContentSecurityPolicy DNSNameResolver DisableKubeletCloudCredentialProviders DynamicResourceAllocation EtcdBackendQuota Example ExternalOIDC GCPClusterHostedDNS GCPLabelsTags HardwareSpeed ImageStreamImportMode IngressControllerDynamicConfigurationManager IngressControllerLBSubnetsAWS InsightsConfig InsightsConfigAPI InsightsOnDemandDataGather InsightsRuntimeExtractor KMSv1 MachineAPIProviderOpenStack MachineConfigNodes ManagedBootImages ManagedBootImagesAWS MaxUnavailableStatefulSet MetricsCollectionProfiles MinimumKubeletVersion MixedCPUsAllocation MultiArchInstallAWS MultiArchInstallGCP NetworkDiagnosticsConfig NetworkLiveMigration NetworkSegmentation NewOLM NodeDisruptionPolicy NodeSwap NutanixMultiSubnets OVNObservability OnClusterBuild OpenShiftPodSecurityAdmission PersistentIPsForVirtualization PinnedImages PlatformOperators PrivateHostedZoneAWS ProcMountType RouteAdvertisements RouteExternalCertificate ServiceAccountTokenNodeBinding SetEIPForNLBIngressController SignatureStores SigstoreImageVerification TranslateStreamCloseWebsocketRequests UpgradeStatus UserNamespacesPodSecurityStandards UserNamespacesSupport VSphereControlPlaneMachineSet VSphereDriverConfiguration VSphereMultiNetworks VSphereMultiVCenters VSphereStaticIPs ValidatingAdmissionPolicy VolumeAttributesClass VolumeGroupSnapshot ClusterAPIInstall ClusterAPIInstallIBMCloud EventedPLEG GatewayAPI MachineAPIMigration MachineAPIOperatorDisableMachineHealthCheckController MultiArchInstallAzure]

(ref 1. for logs)

which highlighted that installer is at the old version of openshift/api.

Holding this PR till openshift/installer is updated so that CI is not broken because of this PR.

  1. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/release-openshift-origin-installer-launch-aws-modern/1894473178118361088#1:build-log.txt%3A328

@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 Feb 25, 2025
@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from c154b70 to dcaddc0 Compare February 26, 2025 19:17
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 26, 2025

@anik120: This pull request references OPRUN-3690 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.19.0" version, but no target version was set.

In response to this:

refer:

Also bumps openshift/api to e8e096a21cb3dbeb93f1dc5138bf42ec766fc407

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.

@anik120
Copy link
Contributor Author

anik120 commented Feb 26, 2025

Bumping openshift/api to e8e096a21cb3dbeb93f1dc5138bf42ec766fc407 to pull in openshift/api#2214

@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from dcaddc0 to ae00e33 Compare February 26, 2025 19:53
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, grokspawn

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 Feb 27, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2025
@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from ae00e33 to fd313cb Compare February 28, 2025 16:18
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2025
@anik120
Copy link
Contributor Author

anik120 commented Feb 28, 2025

/payload-aggregate periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-single-node-techpreview 5
/payload-aggregate periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-serial-ipv4 5
/payload-aggregate periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-single-node 5

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 28, 2025

@anik120: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-single-node-techpreview
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-single-node

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ec0506c0-f600-11ef-840c-63c74d881a13-0

@anik120
Copy link
Contributor Author

anik120 commented Feb 28, 2025

cluster-bot failed to bring up a cluster with this PR with reason

Turns out openshift/library-go#1940 was the issue. #108 re-did the k8s bumps after openshift/library-go#1940 was merged. So pulling in #108 in this PR and re-testing again to confirm issue has been resolved.

anik120 added a commit to anik120/installer that referenced this pull request Feb 28, 2025
Bumping openshift/api because the operator-framework team is
interested in pulling in two commits:

1. [featuregate for catalogd metas web api](openshift/api@d0f74a9)
2. (Follow up to 1) [Fix FeatureGateNewOLMCatalogdAPIV1Metas spelling error](openshift/api@275cd40)

This is motivated by the failure seen in openshift/cluster-olm-operator#104
which [ran into the issue of the cluster failing to come up because the new featuregate was not being registered](openshift/cluster-olm-operator#104 (comment)).

Steps taken:
1. go get github.com/openshift/api@e8e096a21cb3dbeb93f1dc5138bf42ec766fc407
2. go mod tidy
3. go mod vendor

Signed-off-by: Anik Bhattacharjee <[email protected]>
@anik120
Copy link
Contributor Author

anik120 commented Feb 28, 2025

/retest

refer:
* [Metas Endpoint RFC](https://docs.google.com/document/d/1s6_9IFEKGQLNh3ueH7SF4Yrx4PW9NSiNFqFIJx0pU-8/edit?usp=sharing)
* [PR that introduced metas endpoint in catalogd](operator-framework/operator-controller-1643)
* [APIV1MetasHandler naming](operator-framework/operator-controller@45cdb37#diff-03c0636b035013a21712c5f4f04a30ae71ef533c9aa4a6d0724dc5575bf0dffdR9)
* [Guide this PR followed for mapping upstream APIV1MetasHandler feature gate to downstream FeatureGateNewOLMCatalogdMetas} feature gate](https://docs.google.com/document/d/1krN-4vwaE47aLRW9QjwD374-0Sh80taa_7goqVNi_-s/edit?tab=t.0#heading=h.th7069vduyim)

Also bumps openshift/api to v0.0.0-20250228110707-635291d6fdf1
@anik120 anik120 force-pushed the catalogd-metas-endpoint branch from e0f4e63 to 3b249a9 Compare March 3, 2025 15:07
@anik120
Copy link
Contributor Author

anik120 commented Mar 3, 2025

I think we're unblocked at this point

/unhold

@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 Mar 3, 2025
@anik120
Copy link
Contributor Author

anik120 commented Mar 3, 2025

Verified everything works as expected 🎉 :

launch 4.19,openshift/cluster-olm-operator#104,openshift/installer#9522 aws,techpreview

Your cluster is ready, it will be shut down automatically in ~133 minutes.
https://console-openshift-console.apps.ci-ln-vw2xzpt-76ef8.aws-2.ci.openshift.org/
Log in to the console with user kubeadmin and password FE...
$ oc get clusterversion 
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.19.0-0.test-2025-03-03-152223-ci-ln-vw2xzpt-latest   True        False         25m     Cluster version is 4.19.0-0.test-2025-03-03-152223-ci-ln-vw2xzpt-latest

$ oc get featuregate cluster -o yaml | grep APIV1Metas 
- name: NewOLMCatalogdAPIV1Metas
$ oc -n openshift-catalogd port-forward svc/catalogd-service 8080:443
Forwarding from 127.0.0.1:8080 -> 443
Forwarding from [::1]:8080 -> 443
$ curl -vvv -k 'https://localhost:8080/catalogs/openshift-community-operators/api/v1/metas?schema=olm.package'  
* Host localhost:8080 was resolved.
* IPv6: ::1
* IPv4: 127.0.0.1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0*   Trying [::1]:8080...
* Connected to localhost (::1) port 8080
* ALPN: curl offers h2,http/1.1
* (304) (OUT), TLS handshake, Client hello (1):
} [314 bytes data]
* (304) (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* (304) (IN), TLS handshake, Unknown (8):
{ [6 bytes data]
* (304) (IN), TLS handshake, Certificate (11):
{ [1904 bytes data]
* (304) (IN), TLS handshake, CERT verify (15):
{ [264 bytes data]
* (304) (IN), TLS handshake, Finished (20):
{ [36 bytes data]
* (304) (OUT), TLS handshake, Finished (20):
} [36 bytes data]
* SSL connection using TLSv1.3 / AEAD-CHACHA20-POLY1305-SHA256 / [blank] / UNDEF
* ALPN: server did not agree on a protocol. Uses default.
* Server certificate:
*  subject: CN=catalogd-service.openshift-catalogd.svc
*  start date: Mar  3 15:44:27 2025 GMT
*  expire date: Mar  3 15:44:28 2027 GMT
*  issuer: CN=openshift-service-serving-signer@1741016645
*  SSL certificate verify result: self signed certificate in certificate chain (19), continuing anyway.
* using HTTP/1.x
> GET /catalogs/openshift-community-operators/api/v1/metas?schema=olm.package HTTP/1.1
> Host: localhost:8080
> User-Agent: curl/8.7.1
> Accept: */*
> 
* Request completely sent off
< HTTP/1.1 200 OK
< Content-Type: application/jsonl
< Last-Modified: Mon, 03 Mar 2025 16:58:07 GMT
< Vary: Accept-Encoding
< Date: Mon, 03 Mar 2025 17:05:37 GMT
< Transfer-Encoding: chunked
< 
{ [1000 bytes data]
100 5581k    0 5581k    0     0  16.8M      0 --:--:-- --:--:-- --:--:-- 16.9M
* Connection #0 to host localhost left intact
{"defaultChannel":"threescale-2.13","icon":{"base64data":"iVBORw0KGgoAAAANSUhEUgAA...}, "name":"ack-acmpca-controller","schema":"olm.package"}
{"defaultChannel":"alpha","icon":.....

@grokspawn
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 3, 2025

@anik120: 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/okd-scos-e2e-aws-ovn 3b249a9 link false /test okd-scos-e2e-aws-ovn

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.

@openshift-merge-bot openshift-merge-bot bot merged commit f498726 into openshift:main Mar 3, 2025
6 of 7 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-olm-operator
This PR has been included in build ose-cluster-olm-operator-container-v4.19.0-202503032209.p0.gf498726.assembly.stream.el9.
All builds following this will include this PR.

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.

6 participants