Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix occasional CRD generation issues with subresources #4699

Merged
merged 2 commits into from
Jan 3, 2023
Merged

Attempt to fix occasional CRD generation issues with subresources #4699

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c90298
Attempt to fix occasional CRD generation issues with subresources
andreaTP Dec 19, 2022
8f08e38
fmt
andreaTP Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 47 additions & 2 deletions ...a/io/fabric8/crd/generator/v1beta1/decorator/PromoteSingleVersionAttributesDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpecFluent;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersionBuilder;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourcesBuilder;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

Expand All @@ -36,13 +41,53 @@ public PromoteSingleVersionAttributesDecorator(String name) {
super(name);
}

private CustomResourceSubresources mergeSubresources(CustomResourceSubresources versionSub,
CustomResourceSubresources topLevelSub) {
if (versionSub == null) {
return topLevelSub;
} else if (topLevelSub == null) {
return versionSub;
} else {
// merge additional properties
Map<String, Object> additionalProperties = new HashMap<>();
if (versionSub.getAdditionalProperties() != null) {
additionalProperties.putAll(versionSub.getAdditionalProperties());
}
if (topLevelSub.getAdditionalProperties() != null) {
additionalProperties.putAll(topLevelSub.getAdditionalProperties());
}

// merge scale
CustomResourceSubresourceScale scale = null;
if (topLevelSub.getScale() != null) {
scale = topLevelSub.getScale();
} else if (versionSub.getScale() != null) {
scale = versionSub.getScale();
}

// merge status
CustomResourceSubresourceStatus status = null;
if (topLevelSub.getStatus() != null) {
status = topLevelSub.getStatus();
} else if (versionSub.getStatus() != null) {
status = versionSub.getStatus();
}

return new CustomResourceSubresourcesBuilder()
.withAdditionalProperties(additionalProperties)
.withScale(scale)
.withStatus(status)
.build();
}
}

@Override
public void andThenVisit(CustomResourceDefinitionSpecFluent<?> spec, ObjectMeta resourceMeta) {
List<CustomResourceDefinitionVersion> versions = spec.buildVersions();

if (versions.size() == 1) {
CustomResourceDefinitionVersion version = versions.get(0);
spec.withSubresources(version.getSubresources())
spec.withSubresources(mergeSubresources(version.getSubresources(), spec.buildSubresources()))
.withValidation(version.getSchema())
.withAdditionalPrinterColumns(version.getAdditionalPrinterColumns());

Expand Down Expand Up @@ -70,7 +115,7 @@ public void andThenVisit(CustomResourceDefinitionSpecFluent<?> spec, ObjectMeta
}

if (hasIdenticalSubresources) {
spec.withSubresources(subresources.iterator().next());
spec.withSubresources(mergeSubresources(subresources.iterator().next(), spec.buildSubresources()));
}

if (hasIdenticalAdditionalPrinterColumns) {
Expand Down