From ba8584fa26c2ee9caab8d1c135954516b761ffac Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Thu, 2 Sep 2021 10:59:08 +0300 Subject: [PATCH] chore: bump sundrio to 0.50.1 --- CHANGELOG.md | 1 + .../crd/generator/AbstractJsonSchema.java | 35 ++++++++++--------- .../io/fabric8/crd/generator/utils/Types.java | 7 ++-- .../visitor/SpecReplicasPathDetectorTest.java | 11 ++++-- .../CustomResourceAnnotationProcessor.java | 4 +-- extensions/camel-k/model-v1/pom.xml | 4 +++ extensions/camel-k/model-v1alpha1/pom.xml | 4 +++ extensions/certmanager/model-v1/pom.xml | 4 +++ extensions/certmanager/model-v1alpha2/pom.xml | 4 +++ extensions/certmanager/model-v1alpha3/pom.xml | 4 +++ extensions/certmanager/model-v1beta1/pom.xml | 4 +++ extensions/chaosmesh/model/pom.xml | 4 +++ extensions/knative/model/pom.xml | 4 +++ extensions/service-catalog/model/pom.xml | 4 +++ extensions/tekton/model-triggers/pom.xml | 4 +++ extensions/tekton/model-v1alpha1/pom.xml | 4 +++ extensions/tekton/model-v1beta1/pom.xml | 4 +++ extensions/volumesnapshot/model/pom.xml | 4 +++ .../client/utils/OpenIDConnectionUtils.java | 5 +-- .../fabric8/kubernetes/client/ConfigTest.java | 14 ++++---- .../kubernetes/client/internal/UtilsTest.java | 16 +++++---- .../v1/MutatingWebhookConfiguration.java | 8 ++--- .../v1/ValidatingWebhookConfiguration.java | 8 ++--- .../v1beta1/MutatingWebhookConfiguration.java | 8 ++--- .../ValidatingWebhookConfiguration.java | 8 ++--- .../v1/CustomResourceDefinition.java | 8 ++--- .../v1beta1/CustomResourceDefinition.java | 8 ++--- .../api/model/apps/ControllerRevision.java | 8 ++--- .../kubernetes/api/model/apps/DaemonSet.java | 8 ++--- .../kubernetes/api/model/apps/Deployment.java | 8 ++--- .../kubernetes/api/model/apps/ReplicaSet.java | 8 ++--- .../api/model/apps/StatefulSet.java | 8 ++--- .../v1/HorizontalPodAutoscaler.java | 8 ++--- .../v2beta1/HorizontalPodAutoscaler.java | 8 ++--- .../v2beta2/HorizontalPodAutoscaler.java | 8 ++--- .../api/model/batch/v1/CronJob.java | 8 ++--- .../kubernetes/api/model/batch/v1/Job.java | 8 ++--- .../api/model/batch/v1beta1/CronJob.java | 8 ++--- .../v1/CertificateSigningRequest.java | 8 ++--- .../v1beta1/CertificateSigningRequest.java | 8 ++--- .../api/model/coordination/v1/Lease.java | 8 ++--- .../kubernetes/api/model/APIGroup.java | 8 ++--- .../kubernetes/api/model/APIService.java | 8 ++--- .../kubernetes/api/model/ComponentStatus.java | 8 ++--- .../kubernetes/api/model/ConfigMap.java | 8 ++--- .../kubernetes/api/model/Endpoints.java | 8 ++--- .../fabric8/kubernetes/api/model/Event.java | 8 ++--- .../kubernetes/api/model/LimitRange.java | 8 ++--- .../kubernetes/api/model/Namespace.java | 8 ++--- .../io/fabric8/kubernetes/api/model/Node.java | 8 ++--- .../api/model/PersistentVolume.java | 8 ++--- .../api/model/PersistentVolumeClaim.java | 8 ++--- .../io/fabric8/kubernetes/api/model/Pod.java | 8 ++--- .../kubernetes/api/model/PodTemplate.java | 8 ++--- .../api/model/ReplicationController.java | 8 ++--- .../kubernetes/api/model/ResourceQuota.java | 8 ++--- .../fabric8/kubernetes/api/model/Secret.java | 8 ++--- .../fabric8/kubernetes/api/model/Service.java | 8 ++--- .../kubernetes/api/model/ServiceAccount.java | 8 ++--- .../api/model/discovery/v1/EndpointSlice.java | 8 ++--- .../discovery/v1beta1/EndpointSlice.java | 8 ++--- .../kubernetes/api/model/events/v1/Event.java | 8 ++--- .../api/model/events/v1beta1/Event.java | 8 ++--- .../api/model/extensions/DaemonSet.java | 8 ++--- .../api/model/extensions/Deployment.java | 8 ++--- .../api/model/extensions/Ingress.java | 8 ++--- .../api/model/extensions/NetworkPolicy.java | 8 ++--- .../api/model/extensions/ReplicaSet.java | 8 ++--- .../model/flowcontrol/v1beta1/FlowSchema.java | 8 ++--- .../v1beta1/PriorityLevelConfiguration.java | 8 ++--- .../KubernetesCoreTypeAnnotator.java | 8 ++--- .../model/metrics/v1beta1/NodeMetrics.java | 8 ++--- .../api/model/metrics/v1beta1/PodMetrics.java | 8 ++--- .../api/model/networking/v1/Ingress.java | 8 ++--- .../api/model/networking/v1/IngressClass.java | 8 ++--- .../model/networking/v1/NetworkPolicy.java | 8 ++--- .../api/model/networking/v1beta1/Ingress.java | 8 ++--- .../networking/v1beta1/IngressClass.java | 8 ++--- .../api/model/node/v1/RuntimeClass.java | 8 ++--- .../api/model/node/v1alpha1/RuntimeClass.java | 8 ++--- .../api/model/node/v1beta1/RuntimeClass.java | 8 ++--- .../model/policy/v1/PodDisruptionBudget.java | 8 ++--- .../policy/v1beta1/PodDisruptionBudget.java | 8 ++--- .../policy/v1beta1/PodSecurityPolicy.java | 8 ++--- .../api/model/rbac/ClusterRole.java | 8 ++--- .../api/model/rbac/ClusterRoleBinding.java | 8 ++--- .../kubernetes/api/model/rbac/Role.java | 8 ++--- .../api/model/rbac/RoleBinding.java | 8 ++--- .../model/scheduling/v1/PriorityClass.java | 8 ++--- .../scheduling/v1beta1/PriorityClass.java | 8 ++--- .../api/model/storage/CSIDriver.java | 8 ++--- .../kubernetes/api/model/storage/CSINode.java | 8 ++--- .../api/model/storage/StorageClass.java | 8 ++--- .../api/model/storage/VolumeAttachment.java | 8 ++--- .../api/model/storage/v1beta1/CSIDriver.java | 8 ++--- .../api/model/storage/v1beta1/CSINode.java | 8 ++--- .../storage/v1beta1/CSIStorageCapacity.java | 8 ++--- .../v1/ClusterAutoscaler.java | 8 ++--- .../v1beta1/MachineAutoscaler.java | 8 ++--- .../model/console/v1/ConsoleCLIDownload.java | 8 ++--- .../console/v1/ConsoleExternalLogLink.java | 8 ++--- .../api/model/console/v1/ConsoleLink.java | 8 ++--- .../model/console/v1/ConsoleNotification.java | 8 ++--- .../model/console/v1/ConsoleQuickStart.java | 8 ++--- .../model/console/v1/ConsoleYAMLSample.java | 8 ++--- .../model/console/v1alpha1/ConsolePlugin.java | 8 ++--- .../api/model/machine/v1beta1/Machine.java | 8 ++--- .../machine/v1beta1/MachineHealthCheck.java | 8 ++--- .../api/model/machine/v1beta1/MachineSet.java | 8 ++--- .../v1/ContainerRuntimeConfig.java | 8 ++--- .../machineconfig/v1/ControllerConfig.java | 8 ++--- .../model/machineconfig/v1/KubeletConfig.java | 8 ++--- .../model/machineconfig/v1/MachineConfig.java | 8 ++--- .../machineconfig/v1/MachineConfigPool.java | 8 ++--- .../v1/CredentialsRequest.java | 8 ++--- .../cni/v1/NetworkAttachmentDefinition.java | 8 ++--- .../imageregistry/operator/v1/Config.java | 8 ++--- .../metal3/v1alpha1/BareMetalHost.java | 8 ++--- .../network/operator/v1/OperatorPKI.java | 8 ++--- .../api/model/monitoring/v1/Alertmanager.java | 8 ++--- .../api/model/monitoring/v1/PodMonitor.java | 8 ++--- .../api/model/monitoring/v1/Probe.java | 8 ++--- .../api/model/monitoring/v1/Prometheus.java | 8 ++--- .../model/monitoring/v1/PrometheusRule.java | 8 ++--- .../model/monitoring/v1/ServiceMonitor.java | 8 ++--- .../api/model/monitoring/v1/ThanosRuler.java | 8 ++--- .../v1alpha1/AlertmanagerConfig.java | 8 ++--- .../v1alpha1/PodNetworkConnectivityCheck.java | 8 ++--- .../api/model/operator/v1/Authentication.java | 8 ++--- .../operator/v1/CSISnapshotController.java | 8 ++--- .../model/operator/v1/CloudCredential.java | 8 ++--- .../model/operator/v1/ClusterCSIDriver.java | 8 ++--- .../api/model/operator/v1/Config.java | 8 ++--- .../api/model/operator/v1/Console.java | 8 ++--- .../openshift/api/model/operator/v1/DNS.java | 8 ++--- .../api/model/operator/v1/DNSRecord.java | 8 ++--- .../openshift/api/model/operator/v1/Etcd.java | 8 ++--- .../api/model/operator/v1/ImagePruner.java | 8 ++--- .../model/operator/v1/IngressController.java | 8 ++--- .../api/model/operator/v1/KubeAPIServer.java | 8 ++--- .../operator/v1/KubeControllerManager.java | 8 ++--- .../api/model/operator/v1/KubeScheduler.java | 8 ++--- .../v1/KubeStorageVersionMigrator.java | 8 ++--- .../api/model/operator/v1/Network.java | 8 ++--- .../model/operator/v1/OpenShiftAPIServer.java | 8 ++--- .../v1/OpenShiftControllerManager.java | 8 ++--- .../api/model/operator/v1/ServiceCA.java | 8 ++--- .../operator/v1/ServiceCatalogAPIServer.java | 8 ++--- .../v1/ServiceCatalogControllerManager.java | 8 ++--- .../api/model/operator/v1/Storage.java | 8 ++--- .../v1alpha1/ImageContentSourcePolicy.java | 8 ++--- .../lifecyclemanager/v1/PackageManifest.java | 8 ++--- .../api/model/operatorhub/v1/Operator.java | 8 ++--- .../operatorhub/v1/OperatorCondition.java | 8 ++--- .../model/operatorhub/v1/OperatorGroup.java | 8 ++--- .../operatorhub/v1alpha1/CatalogSource.java | 8 ++--- .../v1alpha1/ClusterServiceVersion.java | 8 ++--- .../operatorhub/v1alpha1/InstallPlan.java | 8 ++--- .../operatorhub/v1alpha1/Subscription.java | 8 ++--- .../v1alpha1/StorageState.java | 8 ++--- .../v1alpha1/StorageVersionMigration.java | 8 ++--- .../openshift/api/model/tuned/v1/Profile.java | 8 ++--- .../openshift/api/model/tuned/v1/Tuned.java | 8 ++--- .../model/whereabouts/v1alpha1/IPPool.java | 8 ++--- .../OverlappingRangeIPReservation.java | 8 ++--- .../openshift/api/model/APIServer.java | 8 ++--- .../model/AppliedClusterResourceQuota.java | 8 ++--- .../openshift/api/model/Authentication.java | 8 ++--- .../api/model/BrokerTemplateInstance.java | 8 ++--- .../io/fabric8/openshift/api/model/Build.java | 8 ++--- .../openshift/api/model/BuildConfig.java | 8 ++--- .../openshift/api/model/ClusterNetwork.java | 8 ++--- .../openshift/api/model/ClusterOperator.java | 8 ++--- .../api/model/ClusterResourceQuota.java | 8 ++--- .../openshift/api/model/ClusterRole.java | 8 ++--- .../api/model/ClusterRoleBinding.java | 8 ++--- .../openshift/api/model/ClusterVersion.java | 8 ++--- .../fabric8/openshift/api/model/Console.java | 8 ++--- .../io/fabric8/openshift/api/model/DNS.java | 8 ++--- .../openshift/api/model/DeploymentConfig.java | 8 ++--- .../api/model/EgressNetworkPolicy.java | 8 ++--- .../openshift/api/model/FeatureGate.java | 8 ++--- .../io/fabric8/openshift/api/model/Group.java | 8 ++--- .../api/model/HelmChartRepository.java | 8 ++--- .../openshift/api/model/HostSubnet.java | 8 ++--- .../fabric8/openshift/api/model/Identity.java | 8 ++--- .../io/fabric8/openshift/api/model/Image.java | 8 ++--- .../openshift/api/model/ImageStream.java | 8 ++--- .../openshift/api/model/ImageStreamTag.java | 8 ++--- .../fabric8/openshift/api/model/ImageTag.java | 8 ++--- .../openshift/api/model/Infrastructure.java | 8 ++--- .../fabric8/openshift/api/model/Ingress.java | 8 ++--- .../openshift/api/model/NetNamespace.java | 8 ++--- .../fabric8/openshift/api/model/Network.java | 8 ++--- .../io/fabric8/openshift/api/model/OAuth.java | 8 ++--- .../openshift/api/model/OAuthAccessToken.java | 8 ++--- .../api/model/OAuthAuthorizeToken.java | 8 ++--- .../openshift/api/model/OAuthClient.java | 8 ++--- .../api/model/OAuthClientAuthorization.java | 8 ++--- .../openshift/api/model/OperatorHub.java | 8 ++--- .../fabric8/openshift/api/model/Project.java | 8 ++--- .../io/fabric8/openshift/api/model/Proxy.java | 8 ++--- .../openshift/api/model/RangeAllocation.java | 8 ++--- .../io/fabric8/openshift/api/model/Role.java | 8 ++--- .../openshift/api/model/RoleBinding.java | 8 ++--- .../api/model/RoleBindingRestriction.java | 8 ++--- .../io/fabric8/openshift/api/model/Route.java | 8 ++--- .../openshift/api/model/Scheduler.java | 8 ++--- .../api/model/SecurityContextConstraints.java | 8 ++--- .../openshift/api/model/TemplateInstance.java | 8 ++--- .../io/fabric8/openshift/api/model/User.java | 8 ++--- .../api/model/UserOAuthAccessToken.java | 8 ++--- .../fabric8/openshift/api/model/Template.java | 8 ++--- kubernetes-model-generator/pom.xml | 5 ++- .../io/fabric8/kubernetes/ModelAnnotator.java | 8 ++--- pom.xml | 12 +++++-- 216 files changed, 889 insertions(+), 817 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc64cd6044..589a6b30f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ #### Bugs #### Improvements #### Dependency Upgrade + * Upgrade Sundrio to 0.50.1 #### New Features #### _**Note**_: Breaking changes in the API diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java index 0e4c13da63d..78c0654f9e6 100644 --- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java +++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java @@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Quantity; import io.sundr.builder.internal.functions.TypeAs; -import io.sundr.codegen.functions.ClassTo; import io.sundr.model.*; import io.sundr.utils.Strings; import org.slf4j.Logger; @@ -30,6 +29,21 @@ import java.util.*; +import static io.sundr.model.utils.Types.BOOLEAN; +import static io.sundr.model.utils.Types.BOOLEAN_REF; + +import static io.sundr.model.utils.Types.STRING; +import static io.sundr.model.utils.Types.STRING_REF; + +import static io.sundr.model.utils.Types.INT; +import static io.sundr.model.utils.Types.INT_REF; + +import static io.sundr.model.utils.Types.LONG; +import static io.sundr.model.utils.Types.LONG_REF; + +import static io.sundr.model.utils.Types.DOUBLE; +import static io.sundr.model.utils.Types.DOUBLE_REF; + /** * Encapsulates the common logic supporting OpenAPI schema generation for CRD generation. * @@ -40,27 +54,16 @@ public abstract class AbstractJsonSchema { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractJsonSchema.class); - protected static final TypeDef QUANTITY = ClassTo.TYPEDEF.apply(Quantity.class); - protected static final TypeDef DURATION = ClassTo.TYPEDEF.apply(Duration.class); - protected static final TypeDef INT_OR_STRING = ClassTo.TYPEDEF.apply(IntOrString.class); - + protected static final TypeDef QUANTITY = TypeDef.forName(Quantity.class.getName()); + protected static final TypeDef DURATION = TypeDef.forName(Duration.class.getName()); + protected static final TypeDef INT_OR_STRING =TypeDef.forName(IntOrString.class.getName()); - protected static final TypeDef BOOLEAN = ClassTo.TYPEDEF.apply(Boolean.class); - protected static final TypeDef STRING = ClassTo.TYPEDEF.apply(String.class); - protected static final TypeDef INT = ClassTo.TYPEDEF.apply(Integer.class); - protected static final TypeDef LONG = ClassTo.TYPEDEF.apply(Long.class); - protected static final TypeDef DOUBLE = ClassTo.TYPEDEF.apply(Double.class); - protected static final TypeDef DATE = ClassTo.TYPEDEF.apply(Date.class); protected static final TypeRef QUANTITY_REF = QUANTITY.toReference(); protected static final TypeRef DURATION_REF = DURATION.toReference(); protected static final TypeRef INT_OR_STRING_REF = INT_OR_STRING.toReference(); - protected static final TypeRef BOOLEAN_REF = BOOLEAN.toReference(); - protected static final TypeRef STRING_REF = STRING.toReference(); - protected static final TypeRef INT_REF = INT.toReference(); - protected static final TypeRef LONG_REF = LONG.toReference(); - protected static final TypeRef DOUBLE_REF = DOUBLE.toReference(); + protected static final TypeDef DATE = TypeDef.forName(Date.class.getName()); protected static final TypeRef DATE_REF = DATE.toReference(); private static final String INT_OR_STRING_MARKER = "int_or_string"; diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/utils/Types.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/utils/Types.java index 37bae676307..333041b54d1 100644 --- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/utils/Types.java +++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/utils/Types.java @@ -17,8 +17,8 @@ import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; +import io.sundr.adapter.api.AdapterContext; import io.sundr.adapter.api.Adapters; -import io.sundr.adapter.reflect.ReflectionContext; import io.sundr.builder.TypedVisitor; import io.sundr.model.ClassRef; import io.sundr.model.ClassRefBuilder; @@ -56,11 +56,10 @@ private Types() { private static final Logger LOGGER = LoggerFactory.getLogger(Types.class); private static final String NAMESPACED = Namespaced.class.getName(); public static final String JAVA_LANG_VOID = "java.lang.Void"; - public static final ReflectionContext REFLECTION_CONTEXT = new ReflectionContext(DefinitionRepository.getRepository()); - + public static final AdapterContext REFLECTION_CONTEXT = AdapterContext.create(DefinitionRepository.getRepository()); public static TypeDef typeDefFrom(Class clazz) { - return unshallow(Adapters.adapt(clazz, REFLECTION_CONTEXT)); + return unshallow(Adapters.adaptType(clazz, REFLECTION_CONTEXT)); } public static TypeDef unshallow(TypeDef definition) { diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/generator/visitor/SpecReplicasPathDetectorTest.java b/crd-generator/api/src/test/java/io/fabric8/crd/generator/visitor/SpecReplicasPathDetectorTest.java index ac79d446a5c..a7d37b54e3e 100644 --- a/crd-generator/api/src/test/java/io/fabric8/crd/generator/visitor/SpecReplicasPathDetectorTest.java +++ b/crd-generator/api/src/test/java/io/fabric8/crd/generator/visitor/SpecReplicasPathDetectorTest.java @@ -20,16 +20,21 @@ import io.fabric8.crd.example.webserver.WebServerWithSpec; import io.fabric8.crd.example.webserver.WebServerWithStatusProperty; -import io.sundr.codegen.functions.ClassTo; +import io.sundr.adapter.api.AdapterContext; +import io.sundr.adapter.api.Adapters; import io.sundr.model.TypeDef; import io.sundr.model.TypeDefBuilder; +import io.sundr.model.repo.DefinitionRepository; + import org.junit.jupiter.api.Test; class SpecReplicasPathDetectorTest { + public static final AdapterContext CONTEXT = AdapterContext.create(DefinitionRepository.getRepository()); + @Test public void shoudDetectSpecReplicasPath() throws Exception { - TypeDef def = ClassTo.TYPEDEF.apply(WebServerWithStatusProperty.class); + TypeDef def = Adapters.adaptType(WebServerWithStatusProperty.class, CONTEXT); SpecReplicasPathDetector detector = new SpecReplicasPathDetector(); def = new TypeDefBuilder(def).accept(detector).build(); assertTrue(detector.getPath().isPresent()); @@ -39,7 +44,7 @@ public void shoudDetectSpecReplicasPath() throws Exception { @Test public void shoudDetectNestedSpecReplicasPath() throws Exception { - TypeDef def = ClassTo.TYPEDEF.apply(WebServerWithSpec.class); + TypeDef def = Adapters.adaptType(WebServerWithSpec.class, CONTEXT); SpecReplicasPathDetector detector = new SpecReplicasPathDetector(); def = new TypeDefBuilder(def).accept(detector).build(); assertTrue(detector.getPath().isPresent()); diff --git a/crd-generator/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java b/crd-generator/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java index 7ab5c0f79db..ecb946aa03a 100644 --- a/crd-generator/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java +++ b/crd-generator/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java @@ -26,7 +26,6 @@ import io.fabric8.kubernetes.model.annotation.*; import io.sundr.adapter.api.Adapters; import io.sundr.adapter.apt.AptContext; -import io.sundr.codegen.CodegenContext; import io.sundr.model.TypeDef; import io.sundr.model.repo.DefinitionRepository; @@ -62,7 +61,6 @@ public boolean process(Set annotations, RoundEnvironment // make sure we create the context before using it AptContext.create(processingEnv.getElementUtils(), processingEnv.getTypeUtils(), DefinitionRepository.getRepository()); - CodegenContext.create(processingEnv.getElementUtils(), processingEnv.getTypeUtils()); //Collect all annotated types. for (TypeElement annotation : annotations) { @@ -77,7 +75,7 @@ public boolean process(Set annotations, RoundEnvironment } private CustomResourceInfo toCustomResourceInfo(TypeElement customResource) { - TypeDef definition = Adapters.adapt(customResource, AptContext.getContext()); + TypeDef definition = Adapters.adaptType(customResource, AptContext.getContext()); definition = Types.unshallow(definition); if (CustomResourceInfo.DESCRIBE_TYPE_DEFS) { diff --git a/extensions/camel-k/model-v1/pom.xml b/extensions/camel-k/model-v1/pom.xml index 05df36e1bc0..9ff9693599c 100644 --- a/extensions/camel-k/model-v1/pom.xml +++ b/extensions/camel-k/model-v1/pom.xml @@ -54,6 +54,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/camel-k/model-v1alpha1/pom.xml b/extensions/camel-k/model-v1alpha1/pom.xml index 756ba74a10a..5d0d6cd7800 100644 --- a/extensions/camel-k/model-v1alpha1/pom.xml +++ b/extensions/camel-k/model-v1alpha1/pom.xml @@ -52,6 +52,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/certmanager/model-v1/pom.xml b/extensions/certmanager/model-v1/pom.xml index 136c2c54d3a..71d2739bee6 100755 --- a/extensions/certmanager/model-v1/pom.xml +++ b/extensions/certmanager/model-v1/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/certmanager/model-v1alpha2/pom.xml b/extensions/certmanager/model-v1alpha2/pom.xml index 60548a96800..3345917378f 100755 --- a/extensions/certmanager/model-v1alpha2/pom.xml +++ b/extensions/certmanager/model-v1alpha2/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/certmanager/model-v1alpha3/pom.xml b/extensions/certmanager/model-v1alpha3/pom.xml index c67c3635de5..f357419ac87 100755 --- a/extensions/certmanager/model-v1alpha3/pom.xml +++ b/extensions/certmanager/model-v1alpha3/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/certmanager/model-v1beta1/pom.xml b/extensions/certmanager/model-v1beta1/pom.xml index 1f3e7e884cd..8ce86f67e2f 100755 --- a/extensions/certmanager/model-v1beta1/pom.xml +++ b/extensions/certmanager/model-v1beta1/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/chaosmesh/model/pom.xml b/extensions/chaosmesh/model/pom.xml index e3c0a5535e5..49ea0cff0c6 100755 --- a/extensions/chaosmesh/model/pom.xml +++ b/extensions/chaosmesh/model/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml index b010f8b4de6..9f4afc43c9c 100644 --- a/extensions/knative/model/pom.xml +++ b/extensions/knative/model/pom.xml @@ -53,6 +53,10 @@ io.sundr transform-annotations + + + io.sundr + sundr-codegen-velocity-nodeps io.fabric8 diff --git a/extensions/service-catalog/model/pom.xml b/extensions/service-catalog/model/pom.xml index 729a3798739..69f9d3b9c74 100755 --- a/extensions/service-catalog/model/pom.xml +++ b/extensions/service-catalog/model/pom.xml @@ -54,6 +54,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/tekton/model-triggers/pom.xml b/extensions/tekton/model-triggers/pom.xml index cf011ba47d4..9b651892720 100644 --- a/extensions/tekton/model-triggers/pom.xml +++ b/extensions/tekton/model-triggers/pom.xml @@ -54,6 +54,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/tekton/model-v1alpha1/pom.xml b/extensions/tekton/model-v1alpha1/pom.xml index 98403166f6d..886c8f491c8 100644 --- a/extensions/tekton/model-v1alpha1/pom.xml +++ b/extensions/tekton/model-v1alpha1/pom.xml @@ -52,6 +52,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/tekton/model-v1beta1/pom.xml b/extensions/tekton/model-v1beta1/pom.xml index 381e5a95f87..270896ce7ec 100644 --- a/extensions/tekton/model-v1beta1/pom.xml +++ b/extensions/tekton/model-v1beta1/pom.xml @@ -54,6 +54,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/extensions/volumesnapshot/model/pom.xml b/extensions/volumesnapshot/model/pom.xml index 2ccc8adf871..6a0e7fb6782 100755 --- a/extensions/volumesnapshot/model/pom.xml +++ b/extensions/volumesnapshot/model/pom.xml @@ -55,6 +55,10 @@ io.sundr transform-annotations + + io.sundr + sundr-codegen-velocity-nodeps + io.fabric8 kubernetes-model-core diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/OpenIDConnectionUtils.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/OpenIDConnectionUtils.java index 6daf8ed53e0..1d208a026ca 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/OpenIDConnectionUtils.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/OpenIDConnectionUtils.java @@ -25,7 +25,6 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,6 +51,8 @@ */ public class OpenIDConnectionUtils { private static final Logger LOGGER = LoggerFactory.getLogger(OpenIDConnectionUtils.class); + + public static final String EMPTY = ""; public static final String ID_TOKEN_KUBECONFIG = "id-token"; public static final String ISSUER_KUBECONFIG = "idp-issuer-url"; public static final String REFRESH_TOKEN_KUBECONFIG = "refresh-token"; @@ -240,7 +241,7 @@ static String getParametersFromDiscoveryResponse(Map responseAsJ } else { LOGGER.warn("oidc: oidc: discovery object doesn't contain a {}", key); } - return StringUtils.EMPTY; + return EMPTY; } /** diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java index d0cff7bd6b7..d8806554cbd 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java @@ -18,11 +18,11 @@ import io.fabric8.kubernetes.api.model.ExecConfig; import io.fabric8.kubernetes.api.model.ExecConfigBuilder; +import io.fabric8.kubernetes.client.lib.FileSystem; import io.fabric8.kubernetes.client.utils.Serialization; import io.fabric8.kubernetes.client.utils.Utils; import okhttp3.OkHttpClient; import okhttp3.TlsVersion; -import org.apache.commons.lang.SystemUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -501,11 +501,13 @@ void shouldPropagateImpersonateSettings() { @Test void honorClientAuthenticatorCommands() throws Exception { - if (SystemUtils.IS_OS_WINDOWS) { - System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_WIN_FILE); - } else { - Files.setPosixFilePermissions(Paths.get(TEST_TOKEN_GENERATOR_FILE), PosixFilePermissions.fromString("rwxrwxr-x")); - System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_FILE); + switch (FileSystem.getCurrent()) { + case WINDOWS: + System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_WIN_FILE); + break; + default: + Files.setPosixFilePermissions(Paths.get(TEST_TOKEN_GENERATOR_FILE), PosixFilePermissions.fromString("rwxrwxr-x")); + System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_FILE); } Config config = Config.autoConfigure(null); diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java index 77ae175e958..64191789276 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java @@ -70,6 +70,7 @@ import io.fabric8.kubernetes.api.model.storage.VolumeAttachment; import io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver; import io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode; +import io.fabric8.kubernetes.client.lib.FileSystem; import io.fabric8.kubernetes.client.utils.Utils; import java.io.File; import java.util.Collections; @@ -80,7 +81,6 @@ import java.util.TreeMap; import java.util.concurrent.ThreadFactory; -import org.apache.commons.lang.SystemUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -366,12 +366,14 @@ void testGetCommandPlatformPrefix() { assertNotNull(commandPrefix); assertEquals(2, commandPrefix.size()); - if (SystemUtils.IS_OS_WINDOWS) { - assertEquals("cmd.exe", commandPrefix.get(0)); - assertEquals("/c", commandPrefix.get(1)); - } else { - assertEquals("sh", commandPrefix.get(0)); - assertEquals("-c", commandPrefix.get(1)); + switch (FileSystem.getCurrent()) { + case WINDOWS: + assertEquals("cmd.exe", commandPrefix.get(0)); + assertEquals("/c", commandPrefix.get(1)); + break; + default: + assertEquals("sh", commandPrefix.get(0)); + assertEquals("-c", commandPrefix.get(1)); } } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java index de10a14e8b0..b3284af515a 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("admissionregistration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) }) public class MutatingWebhookConfiguration implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java index cb759293488..a52342e1528 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("admissionregistration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) }) public class ValidatingWebhookConfiguration implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java index a5111925baa..90c62759fd0 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("admissionregistration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) }) public class MutatingWebhookConfiguration implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java index 8b7cf1a1a53..624959a1772 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("admissionregistration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "admissionregistration.properties", gather = true) }) public class ValidatingWebhookConfiguration implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java index d727be5c1fc..c634c699dbc 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("apiextensions.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apiextensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apiextensions.properties", gather = true) }) public class CustomResourceDefinition implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java index 2f0c5202314..1aabdd256cf 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("apiextensions.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apiextensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apiextensions.properties", gather = true) }) public class CustomResourceDefinition implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java index d36d1e79db8..212d17b6705 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) }) public class ControllerRevision implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java index f0300281f10..5b6be109ecd 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) }) public class DaemonSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java index 109dfecfeef..b2cfdfa7e32 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) }) public class Deployment implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java index aed1584206a..fc3d7ef3951 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) }) public class ReplicaSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java index 187596db1a8..af109ca3509 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "apps.properties", gather = true) }) public class StatefulSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java index c402c1b98b4..372c17ab3bb 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("autoscaling") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) }) public class HorizontalPodAutoscaler implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java index a8163d8bfd7..0a5f5d25b0c 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v2beta1") @Group("autoscaling") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) }) public class HorizontalPodAutoscaler implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java index 250352b88f9..68a0c17d528 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v2beta2") @Group("autoscaling") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) }) public class HorizontalPodAutoscaler implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java index 3888e9fd87c..5d9a6f3bd58 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("batch") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) }) public class CronJob implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java index 308fa52ff7e..a944df3800b 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("batch") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) }) public class Job implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java index d0a827451bc..30a1218c120 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("batch") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "batch.properties", gather = true) }) public class CronJob implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java index 81acb290198..3664517b90e 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("certificates.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "certificates.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "certificates.properties", gather = true) }) public class CertificateSigningRequest implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java index b43e8bd071d..cec838db3ef 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("certificates.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "certificates.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "certificates.properties", gather = true) }) public class CertificateSigningRequest implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java index 5bebf57f7cb..f76e8fc1c61 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("coordination.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "coordination.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "coordination.properties", gather = true) }) public class Lease implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIGroup.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIGroup.java index ceede03af96..a852067d404 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIGroup.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIGroup.java @@ -15,8 +15,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -36,8 +36,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class APIGroup implements KubernetesResource { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java index f569df51ce1..e8710a04682 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("apiregistration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class APIService implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java index 19257702426..05831a660cd 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java @@ -15,8 +15,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -33,8 +33,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class ComponentStatus implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java index ff54e1611fa..c18ba9c5796 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -33,8 +33,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class ConfigMap implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java index 75a6803bbca..2a1adace14c 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java @@ -15,8 +15,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -33,8 +33,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Endpoints implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java index fb60bcdd987..7a345168c7f 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -44,8 +44,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Event implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java index dc05bff28f8..662b0becf03 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -31,8 +31,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class LimitRange implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java index cb249d7d732..80509db3464 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Namespace implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java index 914ca6d0029..edbd2155ad4 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Node implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java index 431cf95e428..f57d58555c8 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class PersistentVolume implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java index ac96573e83e..78ce880c87d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class PersistentVolumeClaim implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java index e09a408c617..64897d49e04 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Pod implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java index daebb6a64f2..9f7922e8f44 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -31,8 +31,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class PodTemplate implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java index a7c33f31fe8..c04da594fe1 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class ReplicationController implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java index 7bf0c37dc12..d9bc77b4905 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class ResourceQuota implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java index 6acdeb2d7d4..28f13c97e17 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -34,8 +34,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Secret implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java index c3e21fa6a83..9adc8aeb9c1 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java @@ -13,8 +13,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -32,8 +32,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class Service implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java index ddbc266fdd0..601932d7d16 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java @@ -15,8 +15,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -35,8 +35,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "core.properties", gather = true) }) public class ServiceAccount implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java index bd53efb41f2..3cf34dee562 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1") @Group("discovery.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "discovery.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "discovery.properties", gather = true) }) public class EndpointSlice implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java index a69a8ce95f3..e37780895d5 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1beta1") @Group("discovery.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "discovery.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "discovery.properties", gather = true) }) public class EndpointSlice implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java index a591c95c3e0..524f595d2fe 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -66,8 +66,8 @@ }) @Version("v1") @Group("events.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "events.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "events.properties", gather = true) }) public class Event implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java index 8ba9fd27fc5..4eaa5b76184 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -66,8 +66,8 @@ }) @Version("v1beta1") @Group("events.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "events.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "events.properties", gather = true) }) public class Event implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java index a8d20557ac4..94bd3caaf0d 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("extensions") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) }) public class DaemonSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java index 4d6793409ba..c30dfe9e5cc 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("extensions") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) }) public class Deployment implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java index ab4f6047216..c0e89170e15 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("extensions") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) }) public class Ingress implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java index ea8a14939fc..bac0b89e9e5 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("extensions") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) }) public class NetworkPolicy implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java index 21b60630983..2a034083545 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("extensions") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "extensions.properties", gather = true) }) public class ReplicaSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java index 663fb30a7a0..6ea2a26375b 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("flowcontrol.apiserver.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) }) public class FlowSchema implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java index f5c6dace961..1fc668b8832 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("flowcontrol.apiserver.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) }) public class PriorityLevelConfiguration implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java index 8213ac2fb55..9c6c6700073 100644 --- a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java +++ b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java @@ -29,8 +29,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; import org.jsonschema2pojo.GenerationConfig; @@ -170,9 +170,9 @@ protected void processBuildable(JDefinedClass clazz) { protected void addClassesToPropertyFiles(JDefinedClass clazz) { String packageCategory = getPackageCategory(clazz.getPackage().name()); if (moduleName.equals(packageCategory) /*&& shouldIncludeClass(clazz.name())*/) { - JAnnotationArrayMember arrayMember = clazz.annotate(VelocityTransformations.class) + JAnnotationArrayMember arrayMember = clazz.annotate(TemplateTransformations.class) .paramArray(ANNOTATION_VALUE); - arrayMember.annotate(VelocityTransformation.class).param(ANNOTATION_VALUE, "/manifest.vm") + arrayMember.annotate(TemplateTransformation.class).param(ANNOTATION_VALUE, "/manifest.vm") .param("outputPath", moduleName + ".properties").param("gather", true); } } diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java index 4f5cc7e9c55..64518100c7c 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1beta1") @Group("metrics.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "metrics.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "metrics.properties", gather = true) }) public class NodeMetrics implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java index b77e2217409..4042caf6d87 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java @@ -27,8 +27,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -57,8 +57,8 @@ }) @Version("v1beta1") @Group("metrics.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "metrics.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "metrics.properties", gather = true) }) public class PodMetrics implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java index a2fedde2195..9e45ecc96d4 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("networking.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) }) public class Ingress implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java index 87948338e5b..026054455be 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("networking.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) }) public class IngressClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java index 462aa236226..9df7a10bd5e 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("networking.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) }) public class NetworkPolicy implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java index 782e1176333..d7e76671368 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("networking.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) }) public class Ingress implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java index 44976495de5..af36ac44c23 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1beta1") @Group("networking.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) }) public class IngressClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java index 6d55e900996..21fbc6f32aa 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("node.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) }) public class RuntimeClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java index 9005c2406fd..af69154ce4a 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1alpha1") @Group("node.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) }) public class RuntimeClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java index 0757abec5b6..cc008bcd1fa 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("node.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "node.properties", gather = true) }) public class RuntimeClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java index f3340c059f6..982952fc74f 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("policy") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) }) public class PodDisruptionBudget implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java index ea3502cdca1..9eb5740c279 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("policy") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) }) public class PodDisruptionBudget implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java index bcfb32c7912..4c141ba7e07 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1beta1") @Group("policy") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "policy.properties", gather = true) }) public class PodSecurityPolicy implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java index c0dd63d0878..bc23677a344 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("rbac.authorization.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) }) public class ClusterRole implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java index bc888b7346a..ed550b0bf5f 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("rbac.authorization.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) }) public class ClusterRoleBinding implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java index 96643be79c6..602d53967ce 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("rbac.authorization.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) }) public class Role implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java index 60734b630d5..1d518eb6f69 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -55,8 +55,8 @@ }) @Version("v1") @Group("rbac.authorization.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "rbac.properties", gather = true) }) public class RoleBinding implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java index b87f62054cf..3cb3f4939ac 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("scheduling.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "scheduling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "scheduling.properties", gather = true) }) public class PriorityClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java index 6f0b5f69611..6937baefbb9 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1beta1") @Group("scheduling.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "scheduling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "scheduling.properties", gather = true) }) public class PriorityClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java index c093eb98208..3ced1062944 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class CSIDriver implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java index 096c2013645..183b5442e69 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class CSINode implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java index 602c09e79d8..92ff818d2bb 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -60,8 +60,8 @@ }) @Version("v1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class StorageClass implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java index 94ece49166c..cba85226b18 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class VolumeAttachment implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java index 601841fef8c..9d7291766c2 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1beta1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class CSIDriver implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java index e6c86e6995b..672b1d9edb8 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1beta1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class CSINode implements HasMetadata { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java index 398bea53172..ca8a8138d92 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -55,8 +55,8 @@ }) @Version("v1beta1") @Group("storage.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storage.properties", gather = true) }) public class CSIStorageCapacity implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java index 38d5a99e77c..664c17b1fc6 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("autoscaling.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "clusterautoscaling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "clusterautoscaling.properties", gather = true) }) public class ClusterAutoscaler implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java index c5c382eb634..b61a94d0c35 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("autoscaling.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "clusterautoscaling.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "clusterautoscaling.properties", gather = true) }) public class MachineAutoscaler implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java index 8e7e3a60cae..b1e0cabeed4 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleCLIDownload implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java index f79cc39c873..16e0f7ee550 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleExternalLogLink implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java index 40447d5fac0..f1109086b31 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleLink implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java index 541836d01e1..b6144470f5f 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleNotification implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java index 8ea4a4ed5a6..4aaff477def 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleQuickStart implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java index 98ba989a530..6efcc6bb03c 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsoleYAMLSample implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java index d4094b75107..dd57c98ba09 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1alpha1") @Group("console.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "console.properties", gather = true) }) public class ConsolePlugin implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java index 918747ca881..e880a4b47a3 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("machine.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) }) public class Machine implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java index f384c6c69cd..44c0a1528fe 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("machine.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) }) public class MachineHealthCheck implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java index 8d20f42f161..61a01604a8e 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1beta1") @Group("machine.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machine.properties", gather = true) }) public class MachineSet implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java index 6d6595db3ac..24320e909d7 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("machineconfiguration.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) }) public class ContainerRuntimeConfig implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java index b19f70257f5..365cb00abae 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("machineconfiguration.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) }) public class ControllerConfig implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java index f801863a0fa..d1bb32f9222 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("machineconfiguration.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) }) public class KubeletConfig implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java index 613cf88a50a..a3953adeffd 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("machineconfiguration.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) }) public class MachineConfig implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java index d8a4eb1b2f7..64b89538c33 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("machineconfiguration.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "machineconfig.properties", gather = true) }) public class MachineConfigPool implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java index 4d603450bba..563c19683a0 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("cloudcredential.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) }) public class CredentialsRequest implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java index a0c0b424ffd..9ac2f460e78 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("k8s.cni.cncf.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) }) public class NetworkAttachmentDefinition implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java index 4379c95bbe2..1a3a5656478 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("imageregistry.operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) }) public class Config implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java index a173125345e..6ddd0322766 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("metal3.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) }) public class BareMetalHost implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java index 64ace2b78ca..81bccb50f65 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("network.operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "miscellaneous.properties", gather = true) }) public class OperatorPKI implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java index 5f8ad44ff33..fc192a35a3e 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class Alertmanager implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java index 5c7b36d155b..d0d57699101 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class PodMonitor implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java index eca55ea121a..f0a9aa4897c 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class Probe implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java index 7f99affd106..df2b6396fb1 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class Prometheus implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java index 18c215281e4..e2c94e6e7b7 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class PrometheusRule implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java index e8052ddfe4c..2b5c962ce58 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class ServiceMonitor implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java index 81dc8bf0dd5..5389a509c14 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class ThanosRuler implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java index c5a9705ecde..31f88959079 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1alpha1") @Group("monitoring.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "monitoring.properties", gather = true) }) public class AlertmanagerConfig implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java index a416a970fcf..a9342eb1b68 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("controlplane.operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class PodNetworkConnectivityCheck implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java index 75a820de4ef..491d403bd75 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Authentication implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java index f2dbc4ca67d..c8f32406d9e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class CSISnapshotController implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java index 1fd886f2d55..df8d3c5b6e5 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class CloudCredential implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java index 01502812143..d53d13eb509 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ClusterCSIDriver implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java index 9c4741732fc..df2c96d2c28 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Config implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java index a6b3a502807..d73bca18dac 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Console implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java index 953dd788026..bce73aace09 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class DNS implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java index b1ff6ac52af..36cb9c99a2e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("ingress.operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class DNSRecord implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java index f4cd2b8e5ca..f17a567e9e2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Etcd implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java index 89466a341bf..4d3217fa97a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("imageregistry.operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ImagePruner implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java index ebdc67fc134..29f36bb03ef 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class IngressController implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java index 7d0bcade4bf..f64aefb75ef 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class KubeAPIServer implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java index 8403656ad84..11c676186c3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class KubeControllerManager implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java index 418ecbc6287..845a515c102 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class KubeScheduler implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java index 3d6f96a9d20..aff8e65c4a9 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class KubeStorageVersionMigrator implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java index 7191167ab71..e421e2e86b3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Network implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java index a1e5fc5ba3c..9fb32b9e66c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class OpenShiftAPIServer implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java index 1d85979d50a..751100d9380 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class OpenShiftControllerManager implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java index d0ced88bc44..544c58e3e7c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ServiceCA implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java index cb9af396c84..bff0dbb3334 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ServiceCatalogAPIServer implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java index 299efd20d50..c1f79ce5a2f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ServiceCatalogControllerManager implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java index bff989b1d28..3a5c33c813b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class Storage implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java index 98ca408d445..9bd70195c96 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1alpha1") @Group("operator.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operator.properties", gather = true) }) public class ImageContentSourcePolicy implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java index 6e9ee2be882..e4c139e76bf 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("packages.operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class PackageManifest implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java index 3d9837186b6..f5702b97e22 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class Operator implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java index 5df1057be9f..fd74c4d304b 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class OperatorCondition implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java index fdc7b061f80..767000092e4 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class OperatorGroup implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java index 3db3a36fc32..c13e60e26bd 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class CatalogSource implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java index 9c4325af3fa..f1f25e15995 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class ClusterServiceVersion implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java index f1191b95c1c..ccb4904d7b6 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class InstallPlan implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java index cd98f52edd6..eee37a42fec 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1alpha1") @Group("operators.coreos.com") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "operatorhub.properties", gather = true) }) public class Subscription implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java index 79c57512518..49333f99424 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1alpha1") @Group("migration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storageversionmigrator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storageversionmigrator.properties", gather = true) }) public class StorageState implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java index 016efb86f75..a5e79c78f82 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1alpha1") @Group("migration.k8s.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "storageversionmigrator.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "storageversionmigrator.properties", gather = true) }) public class StorageVersionMigration implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java index c0abcb959aa..2dac927338d 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("tuned.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "tuned.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "tuned.properties", gather = true) }) public class Profile implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java index 33ce127170f..231e9dbd5be 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("tuned.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "tuned.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "tuned.properties", gather = true) }) public class Tuned implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java index 4dba10c2225..5499d949b69 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1alpha1") @Group("whereabouts.cni.cncf.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "whereabouts.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "whereabouts.properties", gather = true) }) public class IPPool implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java index efef763b08c..9ea8fe4f990 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1alpha1") @Group("whereabouts.cni.cncf.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "whereabouts.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "whereabouts.properties", gather = true) }) public class OverlappingRangeIPReservation implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java index d00301607f4..3544e31f3ad 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class APIServer implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java index 14bc448cb64..4c1dff0ff38 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("quota.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class AppliedClusterResourceQuota implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java index d46a104d08f..2b512a6ce61 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Authentication implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java index be940cdb032..bdda6031df7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -51,8 +51,8 @@ }) @Version("v1") @Group("template.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class BrokerTemplateInstance implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java index 3692efd0d93..00f71725216 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("build.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Build implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java index 23c61ef9c8c..8f273385e5c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("build.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class BuildConfig implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java index 889588dbfca..94b94f4ea11 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -59,8 +59,8 @@ }) @Version("v1") @Group("network.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterNetwork implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java index 244c7b3a573..0acdd1582d1 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterOperator implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java index 865b2b3b16f..b518deadeaa 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("quota.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterResourceQuota implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java index 07e96e0bfd7..b85dd900e44 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -55,8 +55,8 @@ }) @Version("v1") @Group("authorization.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterRole implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java index 33b00ec8f7a..40a3596147b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -55,8 +55,8 @@ }) @Version("v1") @Group("authorization.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterRoleBinding implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java index 9b93dabd266..fa205777c73 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ClusterVersion implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java index 079ffee0e79..63478d7b54d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Console implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java index 133f0a3968f..a266919d612 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class DNS implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java index b76aa57b821..1c8d3bc98ee 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("apps.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class DeploymentConfig implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java index dca0ea8fa10..783516096d0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("network.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class EgressNetworkPolicy implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java index 6f9f3dd2f27..c954f551066 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class FeatureGate implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java index 884ebded076..60469bf71f2 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @io.fabric8.kubernetes.model.annotation.Group("user.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Group implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java index 057573b10bb..8b4a948251f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1beta1") @Group("helm.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class HelmChartRepository implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java index 7d600e9a001..fa024604b96 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -57,8 +57,8 @@ }) @Version("v1") @Group("network.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class HostSubnet implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java index 1d918dbfd79..0f13d71d81f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java @@ -22,8 +22,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("user.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Identity implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java index 3524498fe34..d68b4172c4d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java @@ -26,8 +26,8 @@ import io.fabric8.openshift.api.model.runtime.RawExtension; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -62,8 +62,8 @@ }) @Version("v1") @Group("image.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Image implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java index 3885889e10f..5c48f4a3ac0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("image.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ImageStream implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java index c828ec8e132..b75902e2411 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -58,8 +58,8 @@ }) @Version("v1") @Group("image.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ImageStreamTag implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java index 37081b0b616..49923f746b9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("image.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class ImageTag implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java index 8b7bbc75b10..0f904418158 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Infrastructure implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java index d2af059bfc5..787864dfc9b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Ingress implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java index 32753776bb0..219ae564a5a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -55,8 +55,8 @@ }) @Version("v1") @Group("network.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class NetNamespace implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java index b5cecb5fafb..9eb2d159c33 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Network implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java index 02998d142a5..350615dd0c2 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OAuth implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java index 1405707fe81..1bb75f6eb50 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -62,8 +62,8 @@ }) @Version("v1") @Group("oauth.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OAuthAccessToken implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java index 3324af818d9..9ba931cbdeb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -62,8 +62,8 @@ }) @Version("v1") @Group("oauth.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OAuthAuthorizeToken implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java index ea6c7b2dc8f..82a6e2ad140 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -61,8 +61,8 @@ }) @Version("v1") @Group("oauth.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OAuthClient implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java index c83b18ce303..aa96444af7a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1") @Group("oauth.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OAuthClientAuthorization implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java index ddf9173b78e..56781af5fec 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class OperatorHub implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java index 5049a3d12c9..8eb4fd3d818 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("project.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Project implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java index cfe338088bf..979885d898d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Proxy implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java index 9e4d8678565..12c8aabaa1f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("security.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class RangeAllocation implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java index 5a0bfcb1099..6074badc200 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -54,8 +54,8 @@ }) @Version("v1") @Group("authorization.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Role implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java index 16101932a4d..f1abd556daa 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1") @Group("authorization.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class RoleBinding implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java index 140ff2d8f9a..b43d97eda2e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("authorization.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class RoleBindingRestriction implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java index b7ee4f7b760..5c5680d9ae4 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("route.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Route implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java index 6d933f54c8a..d44d575d550 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -52,8 +52,8 @@ }) @Version("v1") @Group("config.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Scheduler implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java index fba0128e103..9f679322f97 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -77,8 +77,8 @@ }) @Version("v1") @Group("security.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class SecurityContextConstraints implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java index 3a067cbf32e..623305cddfb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -53,8 +53,8 @@ }) @Version("v1") @Group("template.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class TemplateInstance implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java index 41b915c680a..6af0ed70e24 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java @@ -26,8 +26,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -56,8 +56,8 @@ }) @Version("v1") @Group("user.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class User implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java index 4deea42d95d..1cc7ce2791d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java @@ -25,8 +25,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -61,8 +61,8 @@ }) @Version("v1") @Group("oauth.openshift.io") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class UserOAuthAccessToken implements HasMetadata { diff --git a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java index 5548e3fbb0a..8a8bafce228 100644 --- a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java +++ b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java @@ -30,8 +30,8 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -64,8 +64,8 @@ @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=false, builderPackage = "io.fabric8.kubernetes.api.builder") @Version("v1") @Group("") -@VelocityTransformations({ - @VelocityTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "openshift.properties", gather = true) }) public class Template implements HasMetadata, Namespaced { diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml index 3aa68cb07c4..d6cde84a91f 100644 --- a/kubernetes-model-generator/pom.xml +++ b/kubernetes-model-generator/pom.xml @@ -94,7 +94,10 @@ io.sundr transform-annotations - + + io.sundr + sundr-codegen-velocity-nodeps + org.junit.jupiter diff --git a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java index eeb166637f0..facc1a9639b 100755 --- a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java +++ b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java @@ -24,8 +24,8 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.VelocityTransformation; -import io.sundr.transform.annotations.VelocityTransformations; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; import lombok.EqualsAndHashCode; import lombok.ToString; import org.jsonschema2pojo.AbstractAnnotator; @@ -76,9 +76,9 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) { } if (isCRD(clazz, propertiesNode)) { // include in model.properties (only CRDs not Lists!) - JAnnotationArrayMember arrayMember = clazz.annotate(VelocityTransformations.class) + JAnnotationArrayMember arrayMember = clazz.annotate(TemplateTransformations.class) .paramArray("value"); - arrayMember.annotate(VelocityTransformation.class) + arrayMember.annotate(TemplateTransformation.class) .param("value", "/manifest.vm") .param("outputPath", "model.properties") .param("gather", true); diff --git a/pom.xml b/pom.xml index a0d7dca9be9..01e5d5a1ba3 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ UTF-8 - 0.40.1 + 0.50.0 3.12.12 3.12.1_1 1.15.0 @@ -459,6 +459,12 @@ ${sundrio.version} provided + + io.sundr + sundr-codegen-velocity-nodeps + ${sundrio.version} + provided + org.projectlombok lombok @@ -749,7 +755,7 @@ io.sundr sundr-maven-plugin ${sundrio.version} - +