change default port of in-process evaluation to 8015

Signed-off-by: odubajDT <[email protected]>

Author: odubajDT

apis/core/v1beta1/common/common.go

@@ -36,7 +36,8 @@ const (
 	ProbesEnabledVar            string = "PROBES_ENABLED"
 	DefaultEnvVarPrefix         string = "FLAGD"
 	DefaultManagementPort       int32  = 8014
-	DefaultPort                 int32  = 8013
+	DefaultRPCPort              int32  = 8013
+	DefaultInProcessPort        int32  = 8015
 	DefaultEvaluator            string = "json"
 	DefaultLogFormat            string = "json"
 	DefaultProbesEnabled        bool   = true

apis/core/v1beta1/featureflaginprocessconfiguration_types.go

@@ -26,8 +26,8 @@ import (
 
 // FeatureFlagInProcessConfigurationSpec defines the desired state of FeatureFlagInProcessConfiguration
 type FeatureFlagInProcessConfigurationSpec struct {
-	// Port defines the port to listen on, defaults to 8013
-	// +kubebuilder:default:=8013
+	// Port defines the port to listen on, defaults to 8015
+	// +kubebuilder:default:=8015
 	// +optional
 	Port int32 `json:"port"`
 
@@ -113,7 +113,7 @@ func (fc *FeatureFlagInProcessConfigurationSpec) Merge(new *FeatureFlagInProcess
 		fc.EnvVars = common.RemoveDuplicateEnvVars(fc.EnvVars)
 	}
 
-	if new.Port != common.DefaultPort {
+	if new.Port != common.DefaultInProcessPort {
 		fc.Port = new.Port
 	}
 	if new.SocketPath != "" {
@@ -159,7 +159,7 @@ func (fc *FeatureFlagInProcessConfigurationSpec) ToEnvVars() []corev1.EnvVar {
 		})
 	}
 
-	if fc.Port != common.DefaultPort {
+	if fc.Port != common.DefaultInProcessPort {
 		envs = append(envs, corev1.EnvVar{
 			Name:  common.EnvVarKey(fc.EnvVarPrefix, common.PortEnvVar),
 			Value: fmt.Sprintf("%d", fc.Port),
@@ -208,7 +208,7 @@ func (fc *FeatureFlagInProcessConfigurationSpec) ToEnvVars() []corev1.EnvVar {
 		})
 	}
 
-        // sets the FLAGD_RESOLVER var to "in-process" to configure the provider for in-process evaluation mode
+	// sets the FLAGD_RESOLVER var to "in-process" to configure the provider for in-process evaluation mode
 	envs = append(envs, corev1.EnvVar{
 		Name:  common.EnvVarKey(fc.EnvVarPrefix, common.ResolverEnvVar),
 		Value: common.InProcessResolverType,

apis/core/v1beta1/featureflagsource_types.go

@@ -221,7 +221,7 @@ func (fc *FeatureFlagSourceSpec) ToEnvVars() []corev1.EnvVar {
 		})
 	}
 
-	if fc.Port != common.DefaultPort {
+	if fc.Port != common.DefaultRPCPort {
 		envs = append(envs, corev1.EnvVar{
 			Name:  common.EnvVarKey(fc.EnvVarPrefix, common.PortEnvVar),
 			Value: fmt.Sprintf("%d", fc.Port),
@@ -249,7 +249,7 @@ func (fc *FeatureFlagSourceSpec) ToEnvVars() []corev1.EnvVar {
 		})
 	}
 
-        // sets the FLAGD_RESOLVER var to "rpc" to configure the provider for RPC evaluation mode
+	// sets the FLAGD_RESOLVER var to "rpc" to configure the provider for RPC evaluation mode
 	envs = append(envs, corev1.EnvVar{
 		Name:  common.EnvVarKey(fc.EnvVarPrefix, common.ResolverEnvVar),
 		Value: common.RPCResolverType,

config/crd/bases/core.openfeature.dev_featureflaginprocessconfigurations.yaml

@@ -175,8 +175,8 @@ spec:
                 description: OfflineFlagSourcePath
                 type: string
               port:
-                default: 8013
-                description: Port defines the port to listen on, defaults to 8013
+                default: 8015
+                description: Port defines the port to listen on, defaults to 8015
                 format: int32
                 type: integer
               selector:

docs/crds.md

@@ -143,10 +143,10 @@ FeatureFlagInProcessConfigurationSpec defines the desired state of FeatureFlagIn
         <td><b>port</b></td>
         <td>integer</td>
         <td>
-          Port defines the port to listen on, defaults to 8013<br/>
+          Port defines the port to listen on, defaults to 8015<br/>
           <br/>
             <i>Format</i>: int32<br/>
-            <i>Default</i>: 8013<br/>
+            <i>Default</i>: 8015<br/>
         </td>
         <td>false</td>
       </tr><tr>

webhooks/common.go

@@ -87,7 +87,7 @@ func NewFeatureFlagSourceSpec(env types.EnvConfig) *api.FeatureFlagSourceSpec {
 
 func NewFeatureFlagInProcessConfigurationSpec() *api.FeatureFlagInProcessConfigurationSpec {
 	return &api.FeatureFlagInProcessConfigurationSpec{
-		Port:                  apicommon.DefaultPort,
+		Port:                  apicommon.DefaultRPCPort,
 		SocketPath:            "",
 		Host:                  apicommon.DefaultHost,
 		TLS:                   false,