🐛 Get clusterId from managedcluster #1290
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: clyang82 <[email protected]>
Signed-off-by: clyang82 <[email protected]>
Signed-off-by: clyang82 <[email protected]>
clyang82
commented
Dec 18, 2024
| @@ -174,10 +180,13 @@ func GetK8SCluster(clusterInfo *clusterinfov1beta1.ManagedClusterInfo, | |||
| k8sCluster.ResourceData.VendorVersion = clusterInfo.Status.DistributionInfo.OCP.Version | |||
| case clusterinfov1beta1.KubeVendorEKS: | |||
| k8sCluster.ResourceData.KubeVendor = kessel.K8SClusterDetail_EKS | |||
| k8sCluster.ResourceData.VendorVersion = clusterInfo.Status.Version | |||
There was a problem hiding this comment.
temporarily set kubeversion as vendorversion to ensure it can send non-OCP cluster information. we need to adopt the latest inventory api in the future.
Signed-off-by: clyang82 <[email protected]>
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: clyang82, yanmxa 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 |
|
yanmxa
pushed a commit
to yanmxa/hub-of-hubs
that referenced
this pull request
Dec 19, 2024
* Get clusterId from managedcluster Signed-off-by: clyang82 <[email protected]> * Enable deploy GH agent when inventory is enabled Signed-off-by: clyang82 <[email protected]> * add vendor version temporarily Signed-off-by: clyang82 <[email protected]> * Fix UT Signed-off-by: clyang82 <[email protected]> --------- Signed-off-by: clyang82 <[email protected]>
yanmxa
added a commit
to yanmxa/hub-of-hubs
that referenced
this pull request
Dec 19, 2024
Signed-off-by: myan <[email protected]> Revert "Bump go version to 1.23.4 (stolostron#1283)" This reverts commit 06ab030. remove duplicate pannel in kafkadashboard (stolostron#1289) Signed-off-by: root <[email protected]> :seedling: bump the embedded postgres to 1.30.0 (stolostron#1278) * 🐛 integration test error for localpolicy event filter (stolostron#1280) * local policy event integration error Signed-off-by: myan <[email protected]> * add the time' Signed-off-by: myan <[email protected]> --------- Signed-off-by: myan <[email protected]> Use Containerfile.operator in Konflux build (stolostron#1279) Signed-off-by: clyang82 <[email protected]> Bump go version to 1.23.4 (stolostron#1283) Signed-off-by: clyang82 <[email protected]> bump the embedded postgres to 1.30.0 Signed-off-by: myan <[email protected]> remove the pgx/v4 Signed-off-by: myan <[email protected]> create the dir for pg Signed-off-by: myan <[email protected]> fix the it Signed-off-by: myan <[email protected]> format mod Signed-off-by: myan <[email protected]> avoid overflow Signed-off-by: myan <[email protected]> * rebase Signed-off-by: myan <[email protected]> * rebase Signed-off-by: myan <[email protected]> --------- Signed-off-by: myan <[email protected]> :sparkles: Build bundle image (stolostron#1275) * Build bundle image Signed-off-by: clyang82 <[email protected]> * add konflux-patch.sh Signed-off-by: clyang82 <[email protected]> * add konflux-patch.sh Signed-off-by: clyang82 <[email protected]> * correct postgres-exporter image sha Signed-off-by: clyang82 <[email protected]> --------- Signed-off-by: clyang82 <[email protected]> :bug: Get clusterId from managedcluster (stolostron#1290) * Get clusterId from managedcluster Signed-off-by: clyang82 <[email protected]> * Enable deploy GH agent when inventory is enabled Signed-off-by: clyang82 <[email protected]> * add vendor version temporarily Signed-off-by: clyang82 <[email protected]> * Fix UT Signed-off-by: clyang82 <[email protected]> --------- Signed-off-by: clyang82 <[email protected]> reply review Signed-off-by: myan <[email protected]>
yanmxa
added a commit
to yanmxa/hub-of-hubs
that referenced
this pull request
Dec 19, 2024
Signed-off-by: myan <[email protected]> Revert "Bump go version to 1.23.4 (stolostron#1283)" This reverts commit 06ab030. remove duplicate pannel in kafkadashboard (stolostron#1289) Signed-off-by: root <[email protected]> :seedling: bump the embedded postgres to 1.30.0 (stolostron#1278) * 🐛 integration test error for localpolicy event filter (stolostron#1280) * local policy event integration error Signed-off-by: myan <[email protected]> * add the time' Signed-off-by: myan <[email protected]> --------- Signed-off-by: myan <[email protected]> Use Containerfile.operator in Konflux build (stolostron#1279) Signed-off-by: clyang82 <[email protected]> Bump go version to 1.23.4 (stolostron#1283) Signed-off-by: clyang82 <[email protected]> bump the embedded postgres to 1.30.0 Signed-off-by: myan <[email protected]> remove the pgx/v4 Signed-off-by: myan <[email protected]> create the dir for pg Signed-off-by: myan <[email protected]> fix the it Signed-off-by: myan <[email protected]> format mod Signed-off-by: myan <[email protected]> avoid overflow Signed-off-by: myan <[email protected]> * rebase Signed-off-by: myan <[email protected]> * rebase Signed-off-by: myan <[email protected]> --------- Signed-off-by: myan <[email protected]> :sparkles: Build bundle image (stolostron#1275) * Build bundle image Signed-off-by: clyang82 <[email protected]> * add konflux-patch.sh Signed-off-by: clyang82 <[email protected]> * add konflux-patch.sh Signed-off-by: clyang82 <[email protected]> * correct postgres-exporter image sha Signed-off-by: clyang82 <[email protected]> --------- Signed-off-by: clyang82 <[email protected]> :bug: Get clusterId from managedcluster (stolostron#1290) * Get clusterId from managedcluster Signed-off-by: clyang82 <[email protected]> * Enable deploy GH agent when inventory is enabled Signed-off-by: clyang82 <[email protected]> * add vendor version temporarily Signed-off-by: clyang82 <[email protected]> * Fix UT Signed-off-by: clyang82 <[email protected]> --------- Signed-off-by: clyang82 <[email protected]> reply review Signed-off-by: myan <[email protected]>
4 tasks
clyang82
pushed a commit
that referenced
this pull request
Dec 20, 2024
Revert "Bump go version to 1.23.4 (#1283)" This reverts commit 06ab030. remove duplicate pannel in kafkadashboard (#1289) :seedling: bump the embedded postgres to 1.30.0 (#1278) * 🐛 integration test error for localpolicy event filter (#1280) * local policy event integration error * add the time' --------- Use Containerfile.operator in Konflux build (#1279) Bump go version to 1.23.4 (#1283) bump the embedded postgres to 1.30.0 remove the pgx/v4 create the dir for pg fix the it format mod avoid overflow * rebase * rebase --------- :sparkles: Build bundle image (#1275) * Build bundle image * add konflux-patch.sh * add konflux-patch.sh * correct postgres-exporter image sha --------- :bug: Get clusterId from managedcluster (#1290) * Get clusterId from managedcluster * Enable deploy GH agent when inventory is enabled * add vendor version temporarily * Fix UT --------- reply review Signed-off-by: myan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Get ClusterId from managedcluster, because there is no clusterId in managedclusterinfo object for non-OpenShift Cluster.
Related issue(s)
Fixes # https://issues.redhat.com/browse/ACM-15814
Tests
make unit-tests.make integration-test.make e2e-test-all.