HYPERFLEET-1408 - feat: map CR fields to API config, trigger rollout on change #6
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| Copyright 2026. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package bundle | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
|
|
||
| hyperfleetv1alpha1 "github.com/openshift-hyperfleet/hyperfleet-operator/api/v1alpha1" | ||
| "github.com/openshift-hyperfleet/hyperfleet-operator/internal/component/api" | ||
| ) | ||
|
|
||
| func TestEntitiesForBundleCloudCAPI(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| ents := entitiesForBundle(hyperfleetv1alpha1.BundleCloudCAPI) | ||
| g.Expect(ents).To(Equal(cloudCAPIEntities)) | ||
| g.Expect(ents).NotTo(BeEmpty()) | ||
|
|
||
| // Sanity: the cloud-capi set registers the core entities the API expects for | ||
| // this flavor. | ||
| kinds := map[string]bool{} | ||
| for _, e := range ents { | ||
| kinds[e.Kind] = true | ||
| } | ||
| g.Expect(kinds).To(HaveKey("Cluster")) | ||
| g.Expect(kinds).To(HaveKey("NodePool")) | ||
| } | ||
|
|
||
| func TestEntitiesForBundleOnPremAgentIsEmpty(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| // The on-prem/agent bundle has no entity set yet: it must be nil (renders no | ||
| // entities: key, so the API registers zero entity types), NOT the cloud-capi | ||
| // set. This pins the contract the corrected comment describes. | ||
| g.Expect(entitiesForBundle(hyperfleetv1alpha1.BundleOnPremAgent)).To(BeNil()) | ||
| } | ||
|
|
||
| func TestEntitiesForBundleUnknownIsEmpty(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| // An unrecognized bundle falls through the switch default and registers no | ||
| // entities rather than silently defaulting to cloud-capi. | ||
| g.Expect(entitiesForBundle(hyperfleetv1alpha1.BundleType("does-not-exist"))).To(BeNil()) | ||
| } | ||
|
|
||
| func TestResolveWiresSharedTierAPIComponent(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| const jwks = "https://issuer.example.com/keys" | ||
| comps := Resolve(hyperfleetv1alpha1.BundleCloudCAPI, Config{ | ||
| APIImage: "example.com/api:test", | ||
| Namespace: "hyperfleet-system", | ||
| ResolvedJWKSURL: jwks, | ||
| }) | ||
|
|
||
| // Phase 1: every bundle resolves to exactly [API]. | ||
| g.Expect(comps).To(HaveLen(1)) | ||
|
|
||
| comp, ok := comps[0].(*api.Component) | ||
| g.Expect(ok).To(BeTrue()) | ||
| g.Expect(comp.Image).To(Equal("example.com/api:test")) | ||
| g.Expect(comp.Namespace).To(Equal("hyperfleet-system")) | ||
| g.Expect(comp.ResolvedJWKSURL).To(Equal(jwks)) | ||
| g.Expect(comp.Entities).To(Equal(cloudCAPIEntities)) | ||
| } | ||
|
|
||
| func TestResolveOnPremAgentHasNoEntities(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| comps := Resolve(hyperfleetv1alpha1.BundleOnPremAgent, Config{Namespace: "ns"}) | ||
| g.Expect(comps).To(HaveLen(1)) | ||
|
|
||
| comp, ok := comps[0].(*api.Component) | ||
| g.Expect(ok).To(BeTrue()) | ||
| g.Expect(comp.Entities).To(BeEmpty()) | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just want to confirm the thinking on
jwkCertURLas a CR field.jwkCertSecretRefI buy, air-gapped is real partner intent. When does a partner have an OIDC issuer that doesn't serve.well-known? Reading the tests, its main job is letting fixtures skip the network call.Every field here is a forever contract (ADR-0019 is pretty explicit about keeping the CR minimal), and per ADR-0020 the gateway owns JWT validation, in-app is defense-in-depth, so this grows the contract to configure the fallback layer. Adding later is compatible, removing isn't. Could we keep discovery + Secret as the two paths for v1alpha1 and leave the URL out until someone actually needs it? If it stays, the CA-file question from the discovery comment will show up as a third field pretty quickly.