Finalized advertised endpoints.

Author: lamai93

pkg/apis/deployment/v1alpha/deployment_spec.go

@@ -302,18 +302,12 @@ func (s DeploymentSpec) ResetImmutableFields(target *DeploymentSpec) []string {
 		target.DisableIPv6 = util.NewBoolOrNil(s.DisableIPv6)
 		resetFields = append(resetFields, "disableIPv6")
 	}
-	if l := s.ExternalAccess.ResetImmutableFields("externalAccess", &target.ExternalAccess); l != nil {
-		resetFields = append(resetFields, l...)
-	}
 	if l := s.RocksDB.ResetImmutableFields("rocksdb", &target.RocksDB); l != nil {
 		resetFields = append(resetFields, l...)
 	}
 	if l := s.Authentication.ResetImmutableFields("auth", &target.Authentication); l != nil {
 		resetFields = append(resetFields, l...)
 	}
-	if l := s.Sync.ResetImmutableFields("sync", &target.Sync); l != nil {
-		resetFields = append(resetFields, l...)
-	}
 	if l := s.Single.ResetImmutableFields(ServerGroupSingle, "single", &target.Single); l != nil {
 		resetFields = append(resetFields, l...)
 	}

pkg/apis/deployment/v1alpha/external_access_spec.go

@@ -99,17 +99,3 @@ func (s *ExternalAccessSpec) SetDefaultsFrom(source ExternalAccessSpec) {
 		s.AdvertisedEndpoint = source.AdvertisedEndpoint
 	}
 }
-
-// ResetImmutableFields replaces all immutable fields in the given target with values from the source spec.
-// It returns a list of fields that have been reset.
-// Field names are relative to given field prefix.
-func (s ExternalAccessSpec) ResetImmutableFields(fieldPrefix string, target *ExternalAccessSpec) []string {
-	var resetFields []string
-
-	// THIS SHOULD NOT BE IMMUTABLE!
-	if s.GetAdvertisedEndpoint() != target.GetAdvertisedEndpoint() {
-		target.AdvertisedEndpoint = util.NewStringOrNil(s.AdvertisedEndpoint)
-		resetFields = append(resetFields, fieldPrefix+".advertisedEndpoint")
-	}
-	return nil
-}

pkg/apis/deployment/v1alpha/sync_external_access_spec.go

@@ -92,11 +92,3 @@ func (s *SyncExternalAccessSpec) SetDefaultsFrom(source SyncExternalAccessSpec)
 		s.AccessPackageSecretNames = append([]string{}, source.AccessPackageSecretNames...)
 	}
 }
-
-// ResetImmutableFields replaces all immutable fields in the given target with values from the source spec.
-// It returns a list of fields that have been reset.
-// Field names are relative to given field prefix.
-func (s SyncExternalAccessSpec) ResetImmutableFields(fieldPrefix string, target *SyncExternalAccessSpec) []string {
-	result := s.ExternalAccessSpec.ResetImmutableFields(fieldPrefix, &s.ExternalAccessSpec)
-	return result
-}

pkg/apis/deployment/v1alpha/sync_spec.go

@@ -89,9 +89,6 @@ func (s *SyncSpec) SetDefaultsFrom(source SyncSpec) {
 // Field names are relative to given field prefix.
 func (s SyncSpec) ResetImmutableFields(fieldPrefix string, target *SyncSpec) []string {
 	var resetFields []string
-	if list := s.ExternalAccess.ResetImmutableFields(fieldPrefix+".externalAccess", &target.ExternalAccess); len(list) > 0 {
-		resetFields = append(resetFields, list...)
-	}
 	if list := s.Authentication.ResetImmutableFields(fieldPrefix+".auth", &target.Authentication); len(list) > 0 {
 		resetFields = append(resetFields, list...)
 	}

pkg/deployment/resources/pod_creator.go

@@ -139,7 +139,10 @@ func createArangodArgs(apiObject metav1.Object, deplSpec api.DeploymentSpec, gro
 		)
 	}
 
-	hasAdvertisedEndpoint := versionHasAdvertisedEndpoint(version)
+	versionHasAdvertisedEndpoint := versionHasAdvertisedEndpoint(version)
+	if !versionHasAdvertisedEndpoint && deplSpec.ExternalAccess.HasAdvertisedEndpoint() {
+		fmt.Printf("Advertised endpoint is not supported by version %s\n", version)
+	}
 
 	/*	if config.ServerThreads != 0 {
 		options = append(options,
@@ -186,7 +189,7 @@ func createArangodArgs(apiObject metav1.Object, deplSpec api.DeploymentSpec, gro
 			optionPair{"--foxx.queues", "true"},
 			optionPair{"--server.statistics", "true"},
 		)
-		if deplSpec.ExternalAccess.HasAdvertisedEndpoint() && hasAdvertisedEndpoint {
+		if deplSpec.ExternalAccess.HasAdvertisedEndpoint() && versionHasAdvertisedEndpoint {
 			options = append(options,
 				optionPair{"--cluster.my-advertised-endpoint", deplSpec.ExternalAccess.GetAdvertisedEndpoint()},
 			)
@@ -203,7 +206,7 @@ func createArangodArgs(apiObject metav1.Object, deplSpec api.DeploymentSpec, gro
 				optionPair{"--cluster.my-address", myTCPURL},
 				optionPair{"--cluster.my-role", "SINGLE"},
 			)
-			if deplSpec.ExternalAccess.HasAdvertisedEndpoint() && hasAdvertisedEndpoint {
+			if deplSpec.ExternalAccess.HasAdvertisedEndpoint() && versionHasAdvertisedEndpoint {
 				options = append(options,
 					optionPair{"--cluster.my-advertised-endpoint", deplSpec.ExternalAccess.GetAdvertisedEndpoint()},
 				)