Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: k0rdent/kcm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c50ae118ffc550af18c39d0f624b1124e02f6304
Choose a base ref
..
head repository: k0rdent/kcm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30c6b61b2ec395baf5a07413e3671dfa46f2d87b
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +2 −2 internal/controller/management_controller.go
  2. +1 −1 internal/webhook/management_webhook_test.go
4 changes: 2 additions & 2 deletions internal/controller/management_controller.go
Original file line number Diff line number Diff line change
@@ -232,11 +232,11 @@ func wrappedComponents(mgmt *hmc.Management) (components []component) {

components = append(components, component{Component: mgmt.Spec.Core.HMC, helmReleaseName: hmc.CoreHMCName})
components = append(components, component{Component: mgmt.Spec.Core.CAPI, helmReleaseName: hmc.CoreCAPIName,
dependsOn: []meta.NamespacedObjectReference{{Name: mgmt.Spec.Core.HMC.Template}}})
dependsOn: []meta.NamespacedObjectReference{{Name: hmc.CoreHMCName}}})

for i := range mgmt.Spec.Providers {
c := component{Component: mgmt.Spec.Providers[i].Component, helmReleaseName: mgmt.Spec.Providers[i].Name,
dependsOn: []meta.NamespacedObjectReference{{Name: mgmt.Spec.Core.CAPI.Template}}}
dependsOn: []meta.NamespacedObjectReference{{Name: hmc.CoreCAPIName}}}

if mgmt.Spec.Providers[i].Template == hmc.ProviderSveltosName {
c.targetNamespace = hmc.ProviderSveltosTargetNamespace
2 changes: 1 addition & 1 deletion internal/webhook/management_webhook_test.go
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ func TestManagementValidateUpdate(t *testing.T) {
warnings admission.Warnings
}{
{
name: "should fail if Managment object has controller.createManagement=true",
name: "should fail if Management object has controller.createManagement=true",
management: objToFail,
warnings: admission.Warnings{"The Management object can't reenable createManagement"},
err: "reenabling of the createManagement parameter is forbidden",