Skip to content

Commit

Permalink
#95 remove component crd steps
Browse files Browse the repository at this point in the history
This way the crd must be provided by another ecosystem.
  • Loading branch information
alexander-dammeier committed Jul 19, 2024
1 parent b688f06 commit 89c8430
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions app/setup/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ func (e *Executor) createComponentOperatorSteps(helmClient *componentHelm.Client
var result []ExecutorStep
namespace := e.SetupContext.AppConfig.TargetNamespace

result = append(result, component.NewInstallHelmChartStep(namespace, e.SetupContext.AppConfig.ComponentOperatorCrdChart, helmClient))
//TODO: only add component-CRD step if CRD does not exist yet
//result = append(result, component.NewInstallHelmChartStep(namespace, e.SetupContext.AppConfig.ComponentOperatorCrdChart, helmClient))
result = append(result, component.NewInstallHelmChartStep(namespace, e.SetupContext.AppConfig.ComponentOperatorChart, helmClient))
operatorComponentSteps, err := e.appendComponentStepsForComponentOperator(componentClient)
if err != nil {
Expand All @@ -177,17 +178,18 @@ func (e *Executor) appendComponentStepsForComponentOperator(componentClient comp
var result []ExecutorStep
namespace := e.SetupContext.AppConfig.TargetNamespace

stepsCrdChart, err := e.createComponentStepsByString(componentClient, e.SetupContext.AppConfig.ComponentOperatorCrdChart, namespace)
if err != nil {
return nil, err
}
//TODO: only add component-CRD step if CRD does not exist yet
//stepsCrdChart, err := e.createComponentStepsByString(componentClient, e.SetupContext.AppConfig.ComponentOperatorCrdChart, namespace)
//if err != nil {
// return nil, err
//}

stepsChart, err := e.createComponentStepsByString(componentClient, e.SetupContext.AppConfig.ComponentOperatorChart, namespace)
if err != nil {
return nil, err
}

result = append(result, stepsCrdChart...)
//result = append(result, stepsCrdChart...)
result = append(result, stepsChart...)

return result, nil
Expand Down

0 comments on commit 89c8430

Please sign in to comment.