Skip to content

Conversation

@TylerGillson
Copy link
Collaborator

@TylerGillson TylerGillson commented Jul 26, 2025

  • If a spoke specifies force-internal-endpoint-lookup, ignore the hub apiserver override
  • Re-accept all CSRs for a spoke cluster when its join condition is nil. Sometimes duplicate CSRs are created by the spoke registration agent when it gets bounced. Prior to this PR, fcc would only ever approve the 1st CSR, which subsequent klusterlet registration agents (post-bounce) don't care about.
  • Move hub CA field to hub to avoid repeating it for all spokes
  • Add global timeout and log verbosity config for all clusteradm commands
  • Handle stdout and stderr separately to ensure join token is parsed correctly when log verbosity is >0
  • Replace all applicable instances of omitempty with omitzero, per the modernize linter
  • Fix make test - make test-unit wasn't outputting coverage results to the expected directory

… move hub CA to spec.hub

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
@openshift-ci
Copy link

openshift-ci bot commented Jul 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TylerGillson

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

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
@TylerGillson TylerGillson merged commit cc61b56 into open-cluster-management-io:main Jul 26, 2025
6 of 7 checks passed
arturshadnik pushed a commit to arturshadnik/ocm-labs that referenced this pull request Jul 27, 2025
…open-cluster-management-io#34)

* fix: ignore hub apiserver when force-internal-endpoint-lookup is set; move hub CA to spec.hub
* feat: add timeout, verbosity to API; modernize applicable omitemptys
* feat: add timeout, verbosity args to all clusteradm commands
* fix: handle stdout & stderr separately
* chore: fix 'make test'
* ci: fix E2E artifact paths
* fix: handle approval of duplicate CSRs
---------

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
openshift-merge-bot bot pushed a commit that referenced this pull request Jul 29, 2025
* 🐛 ignore hub apiserver override when forcing internal endpoint lookup (#34)

* fix: ignore hub apiserver when force-internal-endpoint-lookup is set; move hub CA to spec.hub
* feat: add timeout, verbosity to API; modernize applicable omitemptys
* feat: add timeout, verbosity args to all clusteradm commands
* fix: handle stdout & stderr separately
* chore: fix 'make test'
* ci: fix E2E artifact paths
* fix: handle approval of duplicate CSRs
---------

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>

* feat: implement addon enable/disable flow

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: add hub and spoke addon conditions

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* feat: add validation to prevent deleting in-use addons

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* test: add new expected condition

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* wip: e2e test

[skip ci]

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* test: add e2e tests

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* add docstrings; move code to helper to address gocyclo

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: trigger ci

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: trigger ci

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: demistify magic numbers

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* feat: check number of MW against number of MCAO

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: helper for max type length

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* fix: delete unused code

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: address review comments

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: update magic number; use ownerRef checks when deleting spoke

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* fix: make unjoined check more robust

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: reorder checks

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

* chore: add unit tests; handle unknown conditions

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

---------

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>
Co-authored-by: Tyler Gillson <tyler.gillson@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant