@@ -57,7 +57,7 @@ type ClusterManagerSpec struct {
5757 Tags unikornv1core.TagList `json:"tags,omitempty"`
5858 // ApplicationBundle defines the applications used to create the cluster manager.
5959 // Change this to a new bundle to start an upgrade.
60- ApplicationBundle * string `json:"applicationBundle"`
60+ ApplicationBundle string `json:"applicationBundle"`
6161 // ApplicationBundleAutoUpgrade enables automatic upgrade of application bundles.
6262 // When no properties are set in the specification, the platform will automatically
6363 // choose an upgrade time for your resource. This will be before a working day
@@ -75,22 +75,18 @@ type ClusterManagerStatus struct {
7575// File is a file that can be deployed to a cluster node on creation.
7676type File struct {
7777 // Path is the absolute path to create the file in.
78- Path * string `json:"path"`
78+ Path string `json:"path"`
7979 // Content is the file contents.
8080 Content []byte `json:"content"`
8181}
8282
8383// MachineGenericAutoscaling defines generic autoscaling configuration.
84- // +kubebuilder:validation:XValidation:message="maximumReplicas must be greater than minimumReplicas",rule=(self.maximumReplicas > self.minimumReplicas)
84+ // The maximum number of replicas are sourced from the pool's replica count.
8585type MachineGenericAutoscaling struct {
8686 // MinimumReplicas defines the minimum number of replicas that
8787 // this pool can be scaled down to.
8888 // +kubebuilder:validation:Minimum=0
89- MinimumReplicas * int `json:"minimumReplicas"`
90- // MaximumReplicas defines the maximum numer of replicas that
91- // this pool can be scaled up to.
92- // +kubebuilder:validation:Minimum=1
93- MaximumReplicas * int `json:"maximumReplicas"`
89+ MinimumReplicas int `json:"minimumReplicas"`
9490}
9591
9692// KubernetesWorkloadPoolSpec defines the requested machine pool
@@ -151,20 +147,20 @@ type KubernetesClusterSpec struct {
151147 // Version is the Kubernetes version to install. For performance
152148 // reasons this should match what is already pre-installed on the
153149 // provided image.
154- Version * unikornv1core.SemanticVersion `json:"version"`
150+ Version unikornv1core.SemanticVersion `json:"version"`
155151 // Network defines the Kubernetes networking.
156- Network * KubernetesClusterNetworkSpec `json:"network"`
152+ Network KubernetesClusterNetworkSpec `json:"network"`
157153 // API defines Kubernetes API specific options.
158154 API * KubernetesClusterAPISpec `json:"api,omitempty"`
159155 // ControlPlane defines the cluster manager topology.
160- ControlPlane * unikornv1core.MachineGeneric `json:"controlPlane"`
156+ ControlPlane unikornv1core.MachineGeneric `json:"controlPlane"`
161157 // WorkloadPools defines the workload cluster topology.
162- WorkloadPools * KubernetesClusterWorkloadPoolsSpec `json:"workloadPools"`
158+ WorkloadPools KubernetesClusterWorkloadPoolsSpec `json:"workloadPools"`
163159 // Features defines add-on features that can be enabled for the cluster.
164160 Features * KubernetesClusterFeaturesSpec `json:"features,omitempty"`
165161 // ApplicationBundle defines the applications used to create the cluster.
166162 // Change this to a new bundle to start an upgrade.
167- ApplicationBundle * string `json:"applicationBundle"`
163+ ApplicationBundle string `json:"applicationBundle"`
168164 // ApplicationBundleAutoUpgrade enables automatic upgrade of application bundles.
169165 // When no properties are set in the specification, the platform will automatically
170166 // choose an upgrade time for your resource. This will be before a working day
@@ -185,19 +181,19 @@ type KubernetesClusterAPISpec struct {
185181type KubernetesClusterNetworkSpec struct {
186182 unikornv1core.NetworkGeneric `json:",inline"`
187183 // PodNetwork is the IPv4 prefix for the pod network.
188- PodNetwork * unikornv1core.IPv4Prefix `json:"podNetwork"`
184+ PodNetwork unikornv1core.IPv4Prefix `json:"podNetwork"`
189185 // ServiceNetwork is the IPv4 prefix for the service network.
190- ServiceNetwork * unikornv1core.IPv4Prefix `json:"serviceNetwork"`
186+ ServiceNetwork unikornv1core.IPv4Prefix `json:"serviceNetwork"`
191187}
192188
193189type KubernetesClusterFeaturesSpec struct {
194190 // Autoscaling enables the provision of a cluster autoscaler.
195191 // This is only installed if a workload pool has autoscaling enabled.
196- Autoscaling * bool `json:"autoscaling,omitempty"`
192+ Autoscaling bool `json:"autoscaling,omitempty"`
197193 // GPUOperator enables the provision of a GPU operator.
198194 // This is only installed if a workload pool has a flavor that defines
199195 // a valid GPU specification and vendor.
200- GPUOperator * bool `json:"gpuOperator,omitempty"`
196+ GPUOperator bool `json:"gpuOperator,omitempty"`
201197}
202198
203199type KubernetesClusterWorkloadPoolsPoolSpec struct {
@@ -257,7 +253,7 @@ type VirtualKubernetesClusterSpec struct {
257253 WorkloadPools []VirtualKubernetesClusterWorkloadPoolSpec `json:"workloadPools"`
258254 // ApplicationBundle defines the applications used to create the cluster.
259255 // Change this to a new bundle to start an upgrade.
260- ApplicationBundle * string `json:"applicationBundle"`
256+ ApplicationBundle string `json:"applicationBundle"`
261257 // ApplicationBundleAutoUpgrade enables automatic upgrade of application bundles.
262258 // When no properties are set in the specification, the platform will automatically
263259 // choose an upgrade time for your resource. This will be before a working day
@@ -270,11 +266,10 @@ type VirtualKubernetesClusterWorkloadPoolSpec struct {
270266 // Name is the name of the pool.
271267 Name string `json:"name"`
272268 // Flavor is the regions service flavor to deploy with.
273- FlavorID * string `json:"flavorId"`
269+ FlavorID string `json:"flavorId"`
274270 // Replicas is the initial pool size to deploy.
275271 // +kubebuilder:validation:Minimum=0
276- // +kubebuilder:default=3
277- Replicas * int `json:"replicas,omitempty"`
272+ Replicas int `json:"replicas,omitempty"`
278273}
279274
280275// VirtualKubernetesClusterStatus defines the observed state of the Kubernetes cluster.
@@ -365,7 +360,7 @@ type ApplicationBundleSpec struct {
365360 Version unikornv1core.SemanticVersion `json:"version"`
366361 // Preview indicates that this bundle is a preview and should not be
367362 // used by default.
368- Preview * bool `json:"preview,omitempty"`
363+ Preview bool `json:"preview,omitempty"`
369364 // EndOfLife marks when this bundle should not be advertised any more
370365 // by Unikorn server. It also provides a hint that users should upgrade
371366 // ahead of the deadline, or that a forced upgrade should be triggered.
@@ -377,9 +372,9 @@ type ApplicationBundleSpec struct {
377372type ApplicationNamedReference struct {
378373 // Name is the name of the application. This must match what is encoded into
379374 // Unikorn's application management engine.
380- Name * string `json:"name"`
375+ Name string `json:"name"`
381376 // Reference is a reference to the application definition.
382- Reference * unikornv1core.ApplicationReference `json:"reference"`
377+ Reference unikornv1core.ApplicationReference `json:"reference"`
383378}
384379
385380type ApplicationBundleStatus struct {}
0 commit comments