Merge pull request #74 from vshn/Opensearch/refactor-version

on behalf of component-appcat refactor, I switched version variable n…
vshn · Dec 16, 2022 · a3183b0 · a3183b0
2 parents 99044d7 + 1e6d43d
commit a3183b0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/apis/exoscale/v1/opensearch_types.go b/apis/exoscale/v1/opensearch_types.go
@@ -18,8 +18,8 @@ type OpenSearchParameters struct {
 	// +kubebuilder:validation:Required
 	// Zone is the datacenter identifier in which the instance runs in.
 	Zone Zone `json:"zone"`
-	// Version - supported versions are "1" and "2" (string)
-	Version            string               `json:"version,omitempty"`
+	// majorVersion - supported versions are "1" and "2" (string)
+	MajorVersion       string               `json:"majorVersion,omitempty"`
 	OpenSearchSettings runtime.RawExtension `json:"openSearchSettings,omitempty"`
 }
 
@@ -31,7 +31,7 @@ type OpenSearchSpec struct {
 
 // OpenSearchObservation are the observable fields of a OpenSearch.
 type OpenSearchObservation struct {
-	Version string `json:"version,omitempty"`
+	MajorVersion string `json:"majorVersion,omitempty"`
 	// OpenSearchSettings contains additional OpenSearch settings as set by the provider.
 	OpenSearchSettings runtime.RawExtension `json:"openSearchSettings,omitempty"`
 

diff --git a/generate_sample.go b/generate_sample.go
@@ -337,7 +337,7 @@ func newOpensearchSample() *exoscalev1.OpenSearch {
 					IPFilter: exoscalev1.IPFilter{"0.0.0.0/0"},
 				},
 				Zone:               "ch-dk-2",
-				Version:            "2",
+				MajorVersion:       "2",
 				OpenSearchSettings: runtime.RawExtension{},
 			},
 		},

diff --git a/operator/opensearchcontroller/create.go b/operator/opensearchcontroller/create.go
@@ -36,8 +36,8 @@ func (p *pipeline) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 		},
 		OpensearchSettings:    &settings,
 		TerminationProtection: &forProvider.TerminationProtection,
-		// Version can be only major: ['1','2']
-		Version: &forProvider.Version,
+		// majorVersion can be only major: ['1','2']
+		Version: &forProvider.MajorVersion,
 	}
 	resp, err := p.exo.CreateDbaasServiceOpensearchWithResponse(ctx, oapi.DbaasServiceName(openSearch.GetInstanceName()), body)
 	if err != nil {

diff --git a/operator/opensearchcontroller/observe.go b/operator/opensearchcontroller/observe.go
@@ -107,8 +107,8 @@ func isUpToDate(current, external *exoscalev1.OpenSearchParameters, log logr.Log
 
 func mapObservation(instance oapi.DbaasServiceOpensearch) (exoscalev1.OpenSearchObservation, error) {
 	observation := exoscalev1.OpenSearchObservation{
-		Version:    pointer.StringDeref(instance.Version, ""),
-		NodeStates: mapper.ToNodeStates(instance.NodeStates),
+		MajorVersion: pointer.StringDeref(instance.Version, ""),
+		NodeStates:   mapper.ToNodeStates(instance.NodeStates),
 	}
 
 	settings, err := mapper.ToRawExtension(instance.OpensearchSettings)

diff --git a/operator/opensearchcontroller/webhook.go b/operator/opensearchcontroller/webhook.go
@@ -79,7 +79,7 @@ func (v *Validator) validateSettings(obj exoscalev1.OpenSearchParameters) error
 
 func (v *Validator) validateVersion(obj exoscalev1.OpenSearchParameters) error {
 	// opensearch accepts only major version as a string
-	switch obj.Version {
+	switch obj.MajorVersion {
 	case "1":
 		break
 	case "2":
@@ -114,7 +114,7 @@ func (v *Validator) compareZone(old, new *exoscalev1.OpenSearch) error {
 }
 
 func (v *Validator) compareVersion(old, new *exoscalev1.OpenSearch) error {
-	return webhook.ValidateVersion(old.Status.AtProvider.Version, old.Spec.ForProvider.Version, new.Spec.ForProvider.Version)
+	return webhook.ValidateVersion(old.Status.AtProvider.MajorVersion, old.Spec.ForProvider.MajorVersion, new.Spec.ForProvider.MajorVersion)
 }
 
 func (v *Validator) isCreated(obj *exoscalev1.OpenSearch) bool {

diff --git a/package/crds/exoscale.crossplane.io_opensearches.yaml b/package/crds/exoscale.crossplane.io_opensearches.yaml
@@ -112,6 +112,10 @@ spec:
                         pattern: ^([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$
                         type: string
                     type: object
+                  majorVersion:
+                    description: majorVersion - supported versions are "1" and "2"
+                      (string)
+                    type: string
                   openSearchSettings:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
@@ -125,9 +129,6 @@ spec:
                     description: TerminationProtection protects against termination
                       and powering off.
                     type: boolean
-                  version:
-                    description: Version - supported versions are "1" and "2" (string)
-                    type: string
                   zone:
                     description: Zone is the datacenter identifier in which the instance
                       runs in.
@@ -353,6 +354,8 @@ spec:
                         pattern: ^([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$
                         type: string
                     type: object
+                  majorVersion:
+                    type: string
                   nodeStates:
                     description: State of individual service nodes
                     items:
@@ -404,8 +407,6 @@ spec:
                     description: TerminationProtection protects against termination
                       and powering off.
                     type: boolean
-                  version:
-                    type: string
                 required:
                 - maintenance
                 type: object

diff --git a/samples/exoscale.crossplane.io_opensearch.yaml b/samples/exoscale.crossplane.io_opensearch.yaml
@@ -11,10 +11,10 @@ spec:
     maintenance:
       dayOfWeek: monday
       timeOfDay: "12:01:55"
+    majorVersion: "2"
     openSearchSettings: null
     size:
       plan: hobbyist-2
-    version: "2"
     zone: ch-dk-2
   providerConfigRef:
     name: provider-config