Cleanup naming ved using autoregister functionality
Signed-off-by: Knut-Erik Johnsen <abstract@knut-erik.org>
This commit is contained in:
parent
99e3aae5d1
commit
064fa05647
|
|
@ -25,15 +25,16 @@ public class CrossplaneCompositeResourceService {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static <T extends CustomResource<?, Void>> void registerOrUpdateCompositeResource(T functionDefinition,
|
public static <T extends CustomResource<?, Void>> void registerOrUpdateCompositeResource(String functionName,
|
||||||
boolean addReadyFunction,
|
List<String> additionalFunctions,
|
||||||
|
T functionDefinition,
|
||||||
KubernetesClient kubernetesClient) {
|
KubernetesClient kubernetesClient) {
|
||||||
|
|
||||||
CompositeResourceDefinition compositeResourceDefinition = createCompositeResourceDefinition(functionDefinition);
|
CompositeResourceDefinition compositeResourceDefinition = createCompositeResourceDefinition(functionDefinition);
|
||||||
|
|
||||||
registerOrUpdateCompositeResourceDefinition(compositeResourceDefinition, kubernetesClient);
|
registerOrUpdateCompositeResourceDefinition(compositeResourceDefinition, kubernetesClient);
|
||||||
|
|
||||||
Composition composition = createCompositionDefinition(functionDefinition, addReadyFunction);
|
Composition composition = createCompositionDefinition(functionName, additionalFunctions, functionDefinition);
|
||||||
|
|
||||||
registerOrUpdateCompositeResourceDefinition(composition, kubernetesClient);
|
registerOrUpdateCompositeResourceDefinition(composition, kubernetesClient);
|
||||||
|
|
||||||
|
|
@ -106,11 +107,13 @@ public class CrossplaneCompositeResourceService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T extends CustomResource<?, Void>> Composition createCompositionDefinition(T functionDefinition, boolean addReadyFunction) {
|
private static <T extends CustomResource<?, Void>> Composition createCompositionDefinition(
|
||||||
|
String functionName, List<String> additionalFunctions,
|
||||||
|
T functionDefinition) {
|
||||||
|
|
||||||
Composition composition = new Composition();
|
Composition composition = new Composition();
|
||||||
|
|
||||||
composition.setMetadata(CrossplaneMetadataBuilder.createMetadata("kalypso-" + functionDefinition.getKind().toLowerCase() + "-composition"));
|
composition.setMetadata(CrossplaneMetadataBuilder.createMetadata(functionDefinition.getKind().toLowerCase() + "-composition"));
|
||||||
CompositionSpec compositionSpec = new CompositionSpec();
|
CompositionSpec compositionSpec = new CompositionSpec();
|
||||||
|
|
||||||
CompositeTypeRef compositeTypeRef = new CompositeTypeRef();
|
CompositeTypeRef compositeTypeRef = new CompositeTypeRef();
|
||||||
|
|
@ -122,11 +125,10 @@ public class CrossplaneCompositeResourceService {
|
||||||
|
|
||||||
List<Pipeline> pipelineList = new ArrayList<>();
|
List<Pipeline> pipelineList = new ArrayList<>();
|
||||||
|
|
||||||
pipelineList.add(createPipeline("kalypso-" + functionDefinition.getKind().toLowerCase() + "-function"));
|
pipelineList.add(createPipeline(functionName));
|
||||||
|
|
||||||
|
additionalFunctions.forEach(s -> pipelineList.add(createPipeline(s)));
|
||||||
|
|
||||||
if (addReadyFunction) {
|
|
||||||
pipelineList.add(createPipeline("kalypso-ready-function"));
|
|
||||||
}
|
|
||||||
compositionSpec.setPipeline(pipelineList);
|
compositionSpec.setPipeline(pipelineList);
|
||||||
composition.setSpec(compositionSpec);
|
composition.setSpec(compositionSpec);
|
||||||
return composition;
|
return composition;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue