From 397790841031812594f6e9deefb224cc2a661050 Mon Sep 17 00:00:00 2001 From: Skye Gill Date: Fri, 24 Mar 2023 14:30:40 +0000 Subject: [PATCH] rebase fix Signed-off-by: Skye Gill --- apis/core/v1alpha1/flagservice_types.go | 3 +- .../v1alpha1/flagsourceconfiguration_types.go | 49 +++++++++---------- .../core.openfeature.dev_flagservices.yaml | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/apis/core/v1alpha1/flagservice_types.go b/apis/core/v1alpha1/flagservice_types.go index 8604350b6..5607ec83a 100644 --- a/apis/core/v1alpha1/flagservice_types.go +++ b/apis/core/v1alpha1/flagservice_types.go @@ -29,8 +29,9 @@ type FlagServiceSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster // Important: Run "make" to regenerate code after modifying this file corev1.ServiceSpec `json:",inline"` - ServiceAccountName string `json:"serviceAccountName"` FlagSourceConfiguration string `json:"flagSourceConfiguration"` + // +optional + ServiceAccountName string `json:"serviceAccountName"` } // FlagServiceStatus defines the observed state of FlagService diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types.go b/apis/core/v1alpha1/flagsourceconfiguration_types.go index a28cb83ce..f6a741302 100644 --- a/apis/core/v1alpha1/flagsourceconfiguration_types.go +++ b/apis/core/v1alpha1/flagsourceconfiguration_types.go @@ -29,31 +29,30 @@ import ( type SyncProviderType string const ( - SidecarEnvVarPrefix string = "SIDECAR_ENV_VAR_PREFIX" - InputConfigurationEnvVarPrefix string = "SIDECAR" - SidecarMetricPortEnvVar string = "METRICS_PORT" - SidecarPortEnvVar string = "PORT" - SidecarSocketPathEnvVar string = "SOCKET_PATH" - SidecarEvaluatorEnvVar string = "EVALUATOR" - SidecarImageEnvVar string = "IMAGE" - SidecarVersionEnvVar string = "TAG" - SidecarProviderArgsEnvVar string = "PROVIDER_ARGS" - SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER" - SidecarLogFormatEnvVar string = "LOG_FORMAT" - SidecarProbesEnabledVar string = "PROBES_ENABLED" - defaultSidecarEnvVarPrefix string = "FLAGD" - DefaultMetricPort int32 = 8014 - defaultPort int32 = 8013 - defaultSocketPath string = "" - defaultEvaluator string = "json" - defaultImage string = "ghcr.io/open-feature/flagd" - // INPUT_FLAGD_VERSION` is replaced in the `update-flagd` Makefile target - defaultTag string = "INPUT_FLAGD_VERSION" - defaultLogFormat string = "json" - defaultProbesEnabled bool = true - SyncProviderKubernetes SyncProviderType = "kubernetes" - SyncProviderFilepath SyncProviderType = "filepath" - SyncProviderHttp SyncProviderType = "http" + SidecarEnvVarPrefix string = "SIDECAR_ENV_VAR_PREFIX" + InputConfigurationEnvVarPrefix string = "SIDECAR" + SidecarMetricPortEnvVar string = "METRICS_PORT" + SidecarPortEnvVar string = "PORT" + SidecarSocketPathEnvVar string = "SOCKET_PATH" + SidecarEvaluatorEnvVar string = "EVALUATOR" + SidecarImageEnvVar string = "IMAGE" + SidecarVersionEnvVar string = "TAG" + SidecarProviderArgsEnvVar string = "PROVIDER_ARGS" + SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER" + SidecarLogFormatEnvVar string = "LOG_FORMAT" + SidecarProbesEnabledVar string = "PROBES_ENABLED" + defaultSidecarEnvVarPrefix string = "FLAGD" + DefaultMetricPort int32 = 8014 + defaultPort int32 = 8013 + defaultSocketPath string = "" + defaultEvaluator string = "json" + defaultImage string = "ghcr.io/open-feature/flagd" + defaultTag string = "v0.4.4" + defaultLogFormat string = "json" + defaultProbesEnabled bool = true + SyncProviderKubernetes SyncProviderType = "kubernetes" + SyncProviderFilepath SyncProviderType = "filepath" + SyncProviderHttp SyncProviderType = "http" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/config/crd/bases/core.openfeature.dev_flagservices.yaml b/config/crd/bases/core.openfeature.dev_flagservices.yaml index 7e15408ff..e69e72c87 100644 --- a/config/crd/bases/core.openfeature.dev_flagservices.yaml +++ b/config/crd/bases/core.openfeature.dev_flagservices.yaml @@ -342,7 +342,6 @@ spec: type: string required: - flagSourceConfiguration - - serviceAccountName type: object status: description: FlagServiceStatus defines the observed state of FlagService