diff --git a/PROJECT b/PROJECT index face2ff62..984df6b04 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,7 @@ +# Code generated by tool. DO NOT EDIT. +# This file is used to track the info used to scaffold your project +# and allow the plugins properly work. +# More info: https://book.kubebuilder.io/reference/project-config.html domain: openfeature.dev layout: - go.kubebuilder.io/v3 @@ -59,4 +63,24 @@ resources: kind: FeatureFlagSource path: github.com/open-feature/open-feature-operator/apis/core/v1beta1 version: v1beta1 +- api: + crdVersion: v1 + namespaced: true + domain: openfeature.dev + group: core + kind: FeatureFlagSource + path: github.com/open-feature/open-feature-operator/apis/core/v1beta2 + version: v1beta2 + webhooks: + conversion: true + validation: true + webhookVersion: v1 +- api: + crdVersion: v1 + namespaced: true + domain: openfeature.dev + group: core + kind: FeatureFlag + path: github.com/open-feature/open-feature-operator/apis/core/v1beta2 + version: v1beta2 version: "3" diff --git a/apis/core/v1beta1/common/common.go b/apis/core/v1beta1/common/common.go index 86cbe422b..26132a1fb 100644 --- a/apis/core/v1beta1/common/common.go +++ b/apis/core/v1beta1/common/common.go @@ -1,57 +1,3 @@ package common -import "fmt" - type SyncProviderType string - -const ( - SyncProviderKubernetes SyncProviderType = "kubernetes" - SyncProviderFilepath SyncProviderType = "file" - SyncProviderHttp SyncProviderType = "http" - SyncProviderGrpc SyncProviderType = "grpc" - SyncProviderFlagdProxy SyncProviderType = "flagd-proxy" -) - -func (s SyncProviderType) IsKubernetes() bool { - return s == SyncProviderKubernetes -} - -func (s SyncProviderType) IsHttp() bool { - return s == SyncProviderHttp -} - -func (s SyncProviderType) IsFilepath() bool { - return s == SyncProviderFilepath -} - -func (s SyncProviderType) IsGrpc() bool { - return s == SyncProviderGrpc -} - -func (s SyncProviderType) IsFlagdProxy() bool { - return s == SyncProviderFlagdProxy -} - -func TrueVal() *bool { - b := true - return &b -} - -func FalseVal() *bool { - b := false - return &b -} - -func EnvVarKey(prefix string, suffix string) string { - return fmt.Sprintf("%s_%s", prefix, suffix) -} - -// unique string used to create unique volume mount and file name -func FeatureFlagConfigurationId(namespace, name string) string { - return EnvVarKey(namespace, name) -} - -// unique key (and filename) for configMap data -func FeatureFlagConfigMapKey(namespace, name string) string { - return fmt.Sprintf("%s.flagd.json", FeatureFlagConfigurationId(namespace, name)) -} diff --git a/apis/core/v1beta1/featureflag_types.go b/apis/core/v1beta1/featureflag_types.go index 4c9736610..48f8df7df 100644 --- a/apis/core/v1beta1/featureflag_types.go +++ b/apis/core/v1beta1/featureflag_types.go @@ -19,8 +19,6 @@ package v1beta1 import ( "encoding/json" - "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -62,7 +60,6 @@ type FeatureFlagStatus struct { //+kubebuilder:resource:shortName="ff" //+kubebuilder:object:root=true //+kubebuilder:subresource:status -//+kubebuilder:storageversion // FeatureFlag is the Schema for the featureflags API type FeatureFlag struct { @@ -85,33 +82,3 @@ type FeatureFlagList struct { func init() { SchemeBuilder.Register(&FeatureFlag{}, &FeatureFlagList{}) } - -func (ff *FeatureFlag) GetReference() metav1.OwnerReference { - return metav1.OwnerReference{ - APIVersion: ff.APIVersion, - Kind: ff.Kind, - Name: ff.Name, - UID: ff.UID, - Controller: common.TrueVal(), - } -} - -func (ff *FeatureFlag) GenerateConfigMap(name string, namespace string, references []metav1.OwnerReference) (*corev1.ConfigMap, error) { - b, err := json.Marshal(ff.Spec.FlagSpec) - if err != nil { - return nil, err - } - return &corev1.ConfigMap{ - ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: namespace, - Annotations: map[string]string{ - "openfeature.dev/featureflag": name, - }, - OwnerReferences: references, - }, - Data: map[string]string{ - common.FeatureFlagConfigMapKey(namespace, name): string(b), - }, - }, nil -} diff --git a/apis/core/v1beta1/featureflagsource_conversion.go b/apis/core/v1beta1/featureflagsource_conversion.go new file mode 100644 index 000000000..c3e98e7b7 --- /dev/null +++ b/apis/core/v1beta1/featureflagsource_conversion.go @@ -0,0 +1,143 @@ +package v1beta1 + +import ( + "fmt" + + "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + v1beta2common "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" + corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/conversion" + logf "sigs.k8s.io/controller-runtime/pkg/log" +) + +var featureflagsourcelog = logf.Log.WithName("featureflagsource-resource") + +// ConvertTo converts the src v1beta1.FeatureFlagSource to the hub version (v1beta1.FeatureFlagSource) +// +//nolint:gocyclo +func (src *FeatureFlagSource) ConvertTo(dstRaw conversion.Hub) error { + dst, ok := dstRaw.(*v1beta2.FeatureFlagSource) + + if !ok { + return fmt.Errorf("type %T %s", dstRaw, "unable to convert to v1beta2.FeatureFlagSource") + } + + featureflagsourcelog.Info("conversion ConvertTo", "obj", src) + + // Copy equal stuff to new object + dst.ObjectMeta = src.ObjectMeta + + dst.Spec.EnvVarPrefix = "FLAGD" + if src.Spec.EnvVarPrefix != "" { + dst.Spec.EnvVarPrefix = src.Spec.EnvVarPrefix + } + dst.Spec.RPC = &v1beta2.RPCConf{ + ManagementPort: 8014, + Port: 8013, + SocketPath: src.Spec.SocketPath, + Evaluator: "json", + RolloutOnChange: false, + DefaultSyncProvider: v1beta2common.SyncProviderKubernetes, + LogFormat: "json", // + ProbesEnabled: true, + DebugLogging: false, + OtelCollectorUri: src.Spec.OtelCollectorUri, + } + if src.Spec.ManagementPort != 0 { + dst.Spec.RPC.ManagementPort = src.Spec.ManagementPort + } + if src.Spec.Port != 0 { + dst.Spec.RPC.Port = src.Spec.Port + } + if src.Spec.Evaluator != "" { + dst.Spec.RPC.Evaluator = src.Spec.Evaluator + } + if src.Spec.DefaultSyncProvider != "" { + dst.Spec.RPC.DefaultSyncProvider = v1beta2common.SyncProviderType(src.Spec.DefaultSyncProvider) + } + if src.Spec.LogFormat != "" { + dst.Spec.RPC.LogFormat = src.Spec.LogFormat + } + if src.Spec.RolloutOnChange != nil { + dst.Spec.RPC.RolloutOnChange = *src.Spec.RolloutOnChange + } + if src.Spec.ProbesEnabled != nil { + dst.Spec.RPC.ProbesEnabled = *src.Spec.ProbesEnabled + } + if src.Spec.DebugLogging != nil { + dst.Spec.RPC.DebugLogging = *src.Spec.DebugLogging + } + dst.Spec.RPC.Resources.Limits = src.Spec.Resources.Limits + dst.Spec.RPC.Resources.Requests = src.Spec.Resources.Requests + copy(dst.Spec.RPC.Resources.Claims, src.Spec.Resources.Claims) + dst.Spec.RPC.SyncProviderArgs = make([]string, len(src.Spec.SyncProviderArgs)) + copy(dst.Spec.RPC.SyncProviderArgs, src.Spec.SyncProviderArgs) + dst.Spec.RPC.EnvVars = make([]corev1.EnvVar, len(src.Spec.EnvVars)) + copy(dst.Spec.RPC.EnvVars, src.Spec.EnvVars) + dst.Spec.RPC.Sources = make([]v1beta2.Source, len(src.Spec.Sources)) + for idx, item := range src.Spec.Sources { + dst.Spec.RPC.Sources[idx] = v1beta2.Source{ + Source: item.Source, + Provider: v1beta2common.SyncProviderType(item.Provider), + HttpSyncBearerToken: item.HttpSyncBearerToken, + TLS: item.TLS, + CertPath: item.CertPath, + ProviderID: item.ProviderID, + Selector: item.Selector, + Interval: item.Interval, + } + } + + return nil +} + +// ConvertFrom converts from the hub version (v1beta2.FeatureFlagSource) to this version (v1beta1.FeatureFlagSource) +// +//nolint:gocyclo +func (dst *FeatureFlagSource) ConvertFrom(srcRaw conversion.Hub) error { + src, ok := srcRaw.(*v1beta2.FeatureFlagSource) + + if !ok { + return fmt.Errorf("type %T %s", srcRaw, "unable to convert from v1beta2.FeatureFlagSource") + } + + featureflagsourcelog.Info("conversion ConvertFrom", "obj", src) + + // Copy equal stuff to new object + dst.ObjectMeta = src.ObjectMeta + + dst.Spec.EnvVarPrefix = src.Spec.EnvVarPrefix + dst.Spec.ManagementPort = src.Spec.RPC.ManagementPort + dst.Spec.Port = src.Spec.RPC.Port + dst.Spec.SocketPath = src.Spec.RPC.SocketPath + dst.Spec.RolloutOnChange = &src.Spec.RPC.RolloutOnChange + dst.Spec.Evaluator = src.Spec.RPC.Evaluator + dst.Spec.DefaultSyncProvider = common.SyncProviderType(src.Spec.RPC.DefaultSyncProvider) + dst.Spec.LogFormat = src.Spec.RPC.LogFormat + dst.Spec.ProbesEnabled = &src.Spec.RPC.ProbesEnabled + dst.Spec.DebugLogging = &src.Spec.RPC.DebugLogging + dst.Spec.OtelCollectorUri = src.Spec.RPC.OtelCollectorUri + dst.Spec.Resources.Limits = src.Spec.RPC.Resources.Limits + dst.Spec.Resources.Requests = src.Spec.RPC.Resources.Requests + copy(dst.Spec.Resources.Claims, src.Spec.RPC.Resources.Claims) + dst.Spec.SyncProviderArgs = make([]string, len(src.Spec.RPC.SyncProviderArgs)) + copy(dst.Spec.SyncProviderArgs, src.Spec.RPC.SyncProviderArgs) + dst.Spec.EnvVars = make([]corev1.EnvVar, len(src.Spec.RPC.EnvVars)) + copy(dst.Spec.EnvVars, src.Spec.RPC.EnvVars) + dst.Spec.Sources = make([]Source, len(src.Spec.RPC.Sources)) + for idx, item := range src.Spec.RPC.Sources { + dst.Spec.Sources[idx] = Source{ + Source: item.Source, + Provider: common.SyncProviderType(item.Provider), + HttpSyncBearerToken: item.HttpSyncBearerToken, + TLS: item.TLS, + CertPath: item.CertPath, + ProviderID: item.ProviderID, + Selector: item.Selector, + Interval: item.Interval, + } + } + + return nil +} diff --git a/apis/core/v1beta1/featureflagsource_conversion_test.go b/apis/core/v1beta1/featureflagsource_conversion_test.go new file mode 100644 index 000000000..e25286cfd --- /dev/null +++ b/apis/core/v1beta1/featureflagsource_conversion_test.go @@ -0,0 +1,278 @@ +package v1beta1 + +import ( + "testing" + + "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + v1beta2common "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" + "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +func TestFeatureFlagSource_ConvertFrom(t *testing.T) { + ttt := true + ff := false + tests := []struct { + name string + srcObj *v1beta2.FeatureFlagSource + wantErr bool + wantObj *FeatureFlagSource + }{ + { + name: "Test that conversion from v1beta2 to v1beta1 works", + srcObj: &v1beta2.FeatureFlagSource{ + TypeMeta: metav1.TypeMeta{ + Kind: "FeatureFlagSource", + APIVersion: "core.openfeature.dev/v1beta2", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "ffs", + Namespace: "", + Labels: map[string]string{ + "some-label": "some-label-value", + }, + Annotations: map[string]string{ + "some-annotation": "some-annotation-value", + }, + }, + Spec: v1beta2.FeatureFlagSourceSpec{ + EnvVarPrefix: "prefix", + RPC: &v1beta2.RPCConf{ + ManagementPort: int32(9999), + Port: int32(8888), + SocketPath: "path", + Evaluator: "eval", + Sources: []v1beta2.Source{ + { + Source: "source", + Provider: "prov", + HttpSyncBearerToken: "token", + TLS: true, + CertPath: "certpath", + ProviderID: "id", + Selector: "selector", + Interval: uint32(5), + }, + }, + EnvVars: []corev1.EnvVar{ + { + Name: "name", + Value: "val", + }, + { + Name: "name2", + Value: "val2", + }, + }, + SyncProviderArgs: []string{"some", "args"}, + DefaultSyncProvider: v1beta2common.SyncProviderKubernetes, + LogFormat: "log", + RolloutOnChange: false, + DebugLogging: false, + OtelCollectorUri: "otel", + ProbesEnabled: true, + }, + }, + }, + wantObj: &FeatureFlagSource{ + ObjectMeta: metav1.ObjectMeta{ + Name: "ffs", + Namespace: "", + Labels: map[string]string{ + "some-label": "some-label-value", + }, + Annotations: map[string]string{ + "some-annotation": "some-annotation-value", + }, + }, + Spec: FeatureFlagSourceSpec{ + EnvVarPrefix: "prefix", + ManagementPort: int32(9999), + Port: int32(8888), + SocketPath: "path", + Evaluator: "eval", + Sources: []Source{ + { + Source: "source", + Provider: "prov", + HttpSyncBearerToken: "token", + TLS: true, + CertPath: "certpath", + ProviderID: "id", + Selector: "selector", + Interval: uint32(5), + }, + }, + EnvVars: []corev1.EnvVar{ + { + Name: "name", + Value: "val", + }, + { + Name: "name2", + Value: "val2", + }, + }, + SyncProviderArgs: []string{"some", "args"}, + DefaultSyncProvider: common.SyncProviderType("kubernetes"), + LogFormat: "log", + RolloutOnChange: &ff, + DebugLogging: &ff, + OtelCollectorUri: "otel", + ProbesEnabled: &ttt, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + dst := &FeatureFlagSource{ + TypeMeta: metav1.TypeMeta{}, + ObjectMeta: metav1.ObjectMeta{}, + Spec: FeatureFlagSourceSpec{}, + Status: FeatureFlagSourceStatus{}, + } + if err := dst.ConvertFrom(tt.srcObj); (err != nil) != tt.wantErr { + t.Errorf("ConvertFrom() error = %v, wantErr %v", err, tt.wantErr) + } + if tt.wantObj != nil { + require.Equal(t, tt.wantObj, dst, "Object was not converted correctly") + } + }) + } +} + +func TestFeatureFlagSource_ConvertTo(t *testing.T) { + ttt := true + ff := false + tests := []struct { + name string + srcObj *FeatureFlagSource + wantErr bool + wantObj *v1beta2.FeatureFlagSource + }{ + { + name: "Test that conversion from v1beta2 to v1beta1 works", + wantObj: &v1beta2.FeatureFlagSource{ + ObjectMeta: metav1.ObjectMeta{ + Name: "ffs", + Namespace: "", + Labels: map[string]string{ + "some-label": "some-label-value", + }, + Annotations: map[string]string{ + "some-annotation": "some-annotation-value", + }, + }, + Spec: v1beta2.FeatureFlagSourceSpec{ + EnvVarPrefix: "prefix", + RPC: &v1beta2.RPCConf{ + ManagementPort: int32(9999), + Port: int32(8888), + SocketPath: "path", + Evaluator: "eval", + Sources: []v1beta2.Source{ + { + Source: "source", + Provider: "prov", + HttpSyncBearerToken: "token", + TLS: true, + CertPath: "certpath", + ProviderID: "id", + Selector: "selector", + Interval: uint32(5), + }, + }, + EnvVars: []corev1.EnvVar{ + { + Name: "name", + Value: "val", + }, + { + Name: "name2", + Value: "val2", + }, + }, + SyncProviderArgs: []string{"some", "args"}, + DefaultSyncProvider: v1beta2common.SyncProviderKubernetes, + LogFormat: "log", + RolloutOnChange: false, + DebugLogging: false, + OtelCollectorUri: "otel", + ProbesEnabled: true, + }, + }, + }, + srcObj: &FeatureFlagSource{ + TypeMeta: metav1.TypeMeta{ + Kind: "FeatureFlagSource", + APIVersion: "core.openfeature.dev/v1beta1", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "ffs", + Namespace: "", + Labels: map[string]string{ + "some-label": "some-label-value", + }, + Annotations: map[string]string{ + "some-annotation": "some-annotation-value", + }, + }, + Spec: FeatureFlagSourceSpec{ + EnvVarPrefix: "prefix", + ManagementPort: int32(9999), + Port: int32(8888), + SocketPath: "path", + Evaluator: "eval", + Sources: []Source{ + { + Source: "source", + Provider: "prov", + HttpSyncBearerToken: "token", + TLS: true, + CertPath: "certpath", + ProviderID: "id", + Selector: "selector", + Interval: uint32(5), + }, + }, + EnvVars: []corev1.EnvVar{ + { + Name: "name", + Value: "val", + }, + { + Name: "name2", + Value: "val2", + }, + }, + SyncProviderArgs: []string{"some", "args"}, + DefaultSyncProvider: common.SyncProviderType("kubernetes"), + LogFormat: "log", + RolloutOnChange: &ff, + DebugLogging: &ff, + OtelCollectorUri: "otel", + ProbesEnabled: &ttt, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + dst := &v1beta2.FeatureFlagSource{ + TypeMeta: metav1.TypeMeta{}, + ObjectMeta: metav1.ObjectMeta{}, + Spec: v1beta2.FeatureFlagSourceSpec{}, + Status: v1beta2.FeatureFlagSourceStatus{}, + } + if err := tt.srcObj.ConvertTo(dst); (err != nil) != tt.wantErr { + t.Errorf("ConvertFrom() error = %v, wantErr %v", err, tt.wantErr) + } + if tt.wantObj != nil { + require.Equal(t, tt.wantObj, dst, "Object was not converted correctly") + } + }) + } +} diff --git a/apis/core/v1beta1/featureflagsource_types.go b/apis/core/v1beta1/featureflagsource_types.go index 3de35a82d..f38e09e7e 100644 --- a/apis/core/v1beta1/featureflagsource_types.go +++ b/apis/core/v1beta1/featureflagsource_types.go @@ -17,8 +17,6 @@ limitations under the License. package v1beta1 import ( - "fmt" - "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -151,7 +149,6 @@ type FeatureFlagSourceStatus struct { //+kubebuilder:resource:shortName="ffs" //+kubebuilder:object:root=true //+kubebuilder:subresource:status -//+kubebuilder:storageversion // FeatureFlagSource is the Schema for the FeatureFlagSources API type FeatureFlagSource struct { @@ -174,100 +171,3 @@ type FeatureFlagSourceList struct { func init() { SchemeBuilder.Register(&FeatureFlagSource{}, &FeatureFlagSourceList{}) } - -//nolint:gocyclo -func (fc *FeatureFlagSourceSpec) Merge(new *FeatureFlagSourceSpec) { - if new == nil { - return - } - if new.ManagementPort != 0 { - fc.ManagementPort = new.ManagementPort - } - if new.Port != 0 { - fc.Port = new.Port - } - if new.SocketPath != "" { - fc.SocketPath = new.SocketPath - } - if new.Evaluator != "" { - fc.Evaluator = new.Evaluator - } - if len(new.Sources) != 0 { - fc.Sources = append(fc.Sources, new.Sources...) - } - if len(new.EnvVars) != 0 { - fc.EnvVars = append(fc.EnvVars, new.EnvVars...) - } - if len(new.SyncProviderArgs) != 0 { - fc.SyncProviderArgs = append(fc.SyncProviderArgs, new.SyncProviderArgs...) - } - if new.EnvVarPrefix != "" { - fc.EnvVarPrefix = new.EnvVarPrefix - } - if new.DefaultSyncProvider != "" { - fc.DefaultSyncProvider = new.DefaultSyncProvider - } - if new.LogFormat != "" { - fc.LogFormat = new.LogFormat - } - if new.RolloutOnChange != nil { - fc.RolloutOnChange = new.RolloutOnChange - } - if new.ProbesEnabled != nil { - fc.ProbesEnabled = new.ProbesEnabled - } - if new.DebugLogging != nil { - fc.DebugLogging = new.DebugLogging - } - if new.OtelCollectorUri != "" { - fc.OtelCollectorUri = new.OtelCollectorUri - } -} - -func (fc *FeatureFlagSourceSpec) ToEnvVars() []corev1.EnvVar { - envs := []corev1.EnvVar{} - - for _, envVar := range fc.EnvVars { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, envVar.Name), - Value: envVar.Value, - }) - } - - if fc.ManagementPort != DefaultManagementPort { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarMetricPortEnvVar), - Value: fmt.Sprintf("%d", fc.ManagementPort), - }) - } - - if fc.Port != defaultPort { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarPortEnvVar), - Value: fmt.Sprintf("%d", fc.Port), - }) - } - - if fc.Evaluator != defaultEvaluator { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarEvaluatorEnvVar), - Value: fc.Evaluator, - }) - } - - if fc.SocketPath != defaultSocketPath { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarSocketPathEnvVar), - Value: fc.SocketPath, - }) - } - - if fc.LogFormat != defaultLogFormat { - envs = append(envs, corev1.EnvVar{ - Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarLogFormatEnvVar), - Value: fc.LogFormat, - }) - } - - return envs -} diff --git a/apis/core/v1beta1/featureflagsource_types_test.go b/apis/core/v1beta1/featureflagsource_types_test.go deleted file mode 100644 index 3ce532747..000000000 --- a/apis/core/v1beta1/featureflagsource_types_test.go +++ /dev/null @@ -1,228 +0,0 @@ -package v1beta1 - -import ( - "testing" - - "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" - "github.com/stretchr/testify/require" - v1 "k8s.io/api/core/v1" -) - -func Test_FLagSourceConfiguration_Merge(t *testing.T) { - ff_old := &FeatureFlagSource{ - Spec: FeatureFlagSourceSpec{ - EnvVars: []v1.EnvVar{ - { - Name: "env1", - Value: "val1", - }, - { - Name: "env2", - Value: "val2", - }, - }, - EnvVarPrefix: "PRE", - ManagementPort: 22, - Port: 33, - Evaluator: "evaluator", - SocketPath: "socket-path", - LogFormat: "log", - Sources: []Source{ - { - Source: "src1", - Provider: common.SyncProviderGrpc, - TLS: true, - CertPath: "etc/cert.ca", - ProviderID: "app", - Selector: "source=database", - Interval: 5, - }, - }, - SyncProviderArgs: []string{"arg1", "arg2"}, - DefaultSyncProvider: common.SyncProviderKubernetes, - RolloutOnChange: common.TrueVal(), - ProbesEnabled: common.TrueVal(), - DebugLogging: common.TrueVal(), - OtelCollectorUri: "", - }, - } - - ff_old.Spec.Merge(nil) - - require.Equal(t, &FeatureFlagSource{ - Spec: FeatureFlagSourceSpec{ - EnvVars: []v1.EnvVar{ - { - Name: "env1", - Value: "val1", - }, - { - Name: "env2", - Value: "val2", - }, - }, - EnvVarPrefix: "PRE", - ManagementPort: 22, - Port: 33, - Evaluator: "evaluator", - SocketPath: "socket-path", - LogFormat: "log", - Sources: []Source{ - { - Source: "src1", - Provider: common.SyncProviderGrpc, - TLS: true, - CertPath: "etc/cert.ca", - ProviderID: "app", - Selector: "source=database", - Interval: 5, - }, - }, - SyncProviderArgs: []string{"arg1", "arg2"}, - DefaultSyncProvider: common.SyncProviderKubernetes, - RolloutOnChange: common.TrueVal(), - ProbesEnabled: common.TrueVal(), - DebugLogging: common.TrueVal(), - OtelCollectorUri: "", - }, - }, ff_old) - - ff_new := &FeatureFlagSource{ - Spec: FeatureFlagSourceSpec{ - EnvVars: []v1.EnvVar{ - { - Name: "env3", - Value: "val3", - }, - { - Name: "env4", - Value: "val4", - }, - }, - EnvVarPrefix: "PREFIX", - ManagementPort: 221, - Port: 331, - Evaluator: "evaluator1", - SocketPath: "socket-path1", - LogFormat: "log1", - Sources: []Source{ - { - Source: "src2", - Provider: common.SyncProviderFilepath, - }, - }, - SyncProviderArgs: []string{"arg3", "arg4"}, - DefaultSyncProvider: common.SyncProviderFilepath, - RolloutOnChange: common.FalseVal(), - ProbesEnabled: common.FalseVal(), - DebugLogging: common.FalseVal(), - OtelCollectorUri: "", - }, - } - - ff_old.Spec.Merge(&ff_new.Spec) - - require.Equal(t, &FeatureFlagSource{ - Spec: FeatureFlagSourceSpec{ - EnvVars: []v1.EnvVar{ - { - Name: "env1", - Value: "val1", - }, - { - Name: "env2", - Value: "val2", - }, - { - Name: "env3", - Value: "val3", - }, - { - Name: "env4", - Value: "val4", - }, - }, - EnvVarPrefix: "PREFIX", - ManagementPort: 221, - Port: 331, - Evaluator: "evaluator1", - SocketPath: "socket-path1", - LogFormat: "log1", - Sources: []Source{ - { - Source: "src1", - Provider: common.SyncProviderGrpc, - TLS: true, - CertPath: "etc/cert.ca", - ProviderID: "app", - Selector: "source=database", - Interval: 5, - }, - { - Source: "src2", - Provider: common.SyncProviderFilepath, - }, - }, - SyncProviderArgs: []string{"arg1", "arg2", "arg3", "arg4"}, - DefaultSyncProvider: common.SyncProviderFilepath, - RolloutOnChange: common.FalseVal(), - ProbesEnabled: common.FalseVal(), - DebugLogging: common.FalseVal(), - OtelCollectorUri: "", - }, - }, ff_old) -} - -func Test_FLagSourceConfiguration_ToEnvVars(t *testing.T) { - ff := FeatureFlagSource{ - Spec: FeatureFlagSourceSpec{ - EnvVars: []v1.EnvVar{ - { - Name: "env1", - Value: "val1", - }, - { - Name: "env2", - Value: "val2", - }, - }, - EnvVarPrefix: "PRE", - ManagementPort: 22, - Port: 33, - Evaluator: "evaluator", - SocketPath: "socket-path", - LogFormat: "log", - }, - } - expected := []v1.EnvVar{ - { - Name: "PRE_env1", - Value: "val1", - }, - { - Name: "PRE_env2", - Value: "val2", - }, - { - Name: "PRE_MANAGEMENT_PORT", - Value: "22", - }, - { - Name: "PRE_PORT", - Value: "33", - }, - { - Name: "PRE_EVALUATOR", - Value: "evaluator", - }, - { - Name: "PRE_SOCKET_PATH", - Value: "socket-path", - }, - { - Name: "PRE_LOG_FORMAT", - Value: "log", - }, - } - require.Equal(t, expected, ff.Spec.ToEnvVars()) -} diff --git a/apis/core/v1beta2/common/common.go b/apis/core/v1beta2/common/common.go new file mode 100644 index 000000000..86cbe422b --- /dev/null +++ b/apis/core/v1beta2/common/common.go @@ -0,0 +1,57 @@ +package common + +import "fmt" + +type SyncProviderType string + +const ( + SyncProviderKubernetes SyncProviderType = "kubernetes" + SyncProviderFilepath SyncProviderType = "file" + SyncProviderHttp SyncProviderType = "http" + SyncProviderGrpc SyncProviderType = "grpc" + SyncProviderFlagdProxy SyncProviderType = "flagd-proxy" +) + +func (s SyncProviderType) IsKubernetes() bool { + return s == SyncProviderKubernetes +} + +func (s SyncProviderType) IsHttp() bool { + return s == SyncProviderHttp +} + +func (s SyncProviderType) IsFilepath() bool { + return s == SyncProviderFilepath +} + +func (s SyncProviderType) IsGrpc() bool { + return s == SyncProviderGrpc +} + +func (s SyncProviderType) IsFlagdProxy() bool { + return s == SyncProviderFlagdProxy +} + +func TrueVal() *bool { + b := true + return &b +} + +func FalseVal() *bool { + b := false + return &b +} + +func EnvVarKey(prefix string, suffix string) string { + return fmt.Sprintf("%s_%s", prefix, suffix) +} + +// unique string used to create unique volume mount and file name +func FeatureFlagConfigurationId(namespace, name string) string { + return EnvVarKey(namespace, name) +} + +// unique key (and filename) for configMap data +func FeatureFlagConfigMapKey(namespace, name string) string { + return fmt.Sprintf("%s.flagd.json", FeatureFlagConfigurationId(namespace, name)) +} diff --git a/apis/core/v1beta1/common/common_test.go b/apis/core/v1beta2/common/common_test.go similarity index 100% rename from apis/core/v1beta1/common/common_test.go rename to apis/core/v1beta2/common/common_test.go diff --git a/apis/core/v1beta2/featureflag_types.go b/apis/core/v1beta2/featureflag_types.go new file mode 100644 index 000000000..ed2b47ecd --- /dev/null +++ b/apis/core/v1beta2/featureflag_types.go @@ -0,0 +1,116 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta2 + +import ( + "encoding/json" + + "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// FeatureFlagSpec defines the desired state of FeatureFlag +type FeatureFlagSpec struct { + // FlagSpec is the structured representation of the feature flag specification + FlagSpec FlagSpec `json:"flagSpec,omitempty"` +} + +type FlagSpec struct { + Flags map[string]Flag `json:"flags"` + // +optional + // +kubebuilder:validation:Schemaless + // +kubebuilder:pruning:PreserveUnknownFields + // +kubebuilder:validation:Type=object + Evaluators json.RawMessage `json:"$evaluators,omitempty"` +} + +type Flag struct { + // +kubebuilder:validation:Enum=ENABLED;DISABLED + State string `json:"state"` + // +kubebuilder:validation:Schemaless + // +kubebuilder:pruning:PreserveUnknownFields + // +kubebuilder:validation:Type=object + Variants json.RawMessage `json:"variants"` + DefaultVariant string `json:"defaultVariant"` + // +optional + // +kubebuilder:validation:Schemaless + // +kubebuilder:pruning:PreserveUnknownFields + // +kubebuilder:validation:Type=object + // Targeting is the json targeting rule + Targeting json.RawMessage `json:"targeting,omitempty"` +} + +// FeatureFlagStatus defines the observed state of FeatureFlag +type FeatureFlagStatus struct { +} + +//+kubebuilder:resource:shortName="ff" +//+kubebuilder:object:root=true +//+kubebuilder:subresource:status +//+kubebuilder:storageversion + +// FeatureFlag is the Schema for the featureflags API +type FeatureFlag struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec FeatureFlagSpec `json:"spec,omitempty"` + Status FeatureFlagStatus `json:"status,omitempty"` +} + +// +kubebuilder:object:root=true +// FeatureFlagList contains a list of FeatureFlag +type FeatureFlagList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []FeatureFlag `json:"items"` +} + +func init() { + SchemeBuilder.Register(&FeatureFlag{}, &FeatureFlagList{}) +} + +func (ff *FeatureFlag) GetReference() metav1.OwnerReference { + return metav1.OwnerReference{ + APIVersion: ff.APIVersion, + Kind: ff.Kind, + Name: ff.Name, + UID: ff.UID, + Controller: common.TrueVal(), + } +} + +func (ff *FeatureFlag) GenerateConfigMap(name string, namespace string, references []metav1.OwnerReference) (*corev1.ConfigMap, error) { + b, err := json.Marshal(ff.Spec.FlagSpec) + if err != nil { + return nil, err + } + return &corev1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{ + Name: name, + Namespace: namespace, + Annotations: map[string]string{ + "openfeature.dev/featureflag": name, + }, + OwnerReferences: references, + }, + Data: map[string]string{ + common.FeatureFlagConfigMapKey(namespace, name): string(b), + }, + }, nil +} diff --git a/apis/core/v1beta1/featureflag_types_test.go b/apis/core/v1beta2/featureflag_types_test.go similarity index 98% rename from apis/core/v1beta1/featureflag_types_test.go rename to apis/core/v1beta2/featureflag_types_test.go index d5bcc6514..4761e42cb 100644 --- a/apis/core/v1beta1/featureflag_types_test.go +++ b/apis/core/v1beta2/featureflag_types_test.go @@ -1,9 +1,9 @@ -package v1beta1 +package v1beta2 import ( "testing" - "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/apis/core/v1beta2/featureflagsource_conversion.go b/apis/core/v1beta2/featureflagsource_conversion.go new file mode 100644 index 000000000..033e5404a --- /dev/null +++ b/apis/core/v1beta2/featureflagsource_conversion.go @@ -0,0 +1,6 @@ +package v1beta2 + +// Hub is the stub function to make the API conversion pattern with hub and spokes complete +func (*FeatureFlagSource) Hub() { + // Hub() needed to implement interface +} diff --git a/apis/core/v1beta2/featureflagsource_types.go b/apis/core/v1beta2/featureflagsource_types.go new file mode 100644 index 000000000..5a86ecffc --- /dev/null +++ b/apis/core/v1beta2/featureflagsource_types.go @@ -0,0 +1,391 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta2 + +import ( + "fmt" + + "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +const ( + MetricPortEnvVar string = "MANAGEMENT_PORT" + PortEnvVar string = "PORT" + HostEnvVar string = "HOST" + TLSEnvVar string = "TLS" + SocketPathEnvVar string = "SOCKET_PATH" + OfflineFlagSourcePathEnvVar string = "OFFLINE_FLAG_SOURCE_PATH" + SelectorEnvVar string = "SOURCE_SELECTOR" + CacheEnvVar string = "CACHE" + CacheMaxSizeEnvVar string = "MAX_CACHE_SIZE" + ResolverEnvVar string = "RESOLVER" + EvaluatorEnvVar string = "EVALUATOR" + ImageEnvVar string = "IMAGE" + VersionEnvVar string = "TAG" + ProviderArgsEnvVar string = "PROVIDER_ARGS" + DefaultSyncProviderEnvVar string = "SYNC_PROVIDER" + LogFormatEnvVar string = "LOG_FORMAT" + ProbesEnabledVar string = "PROBES_ENABLED" + defaultEnvVarPrefix string = "FLAGD" + DefaultManagementPort int32 = 8014 + defaultPort int32 = 8013 + defaultEvaluator string = "json" + defaultLogFormat string = "json" + defaultProbesEnabled bool = true + defaultTLS bool = false + defaultHost string = "localhost" + defaultCache string = "lru" + defaultCacheMaxSize int32 = 1000 +) + +// FeatureFlagSourceSpec defines the desired state of FeatureFlagSource +type FeatureFlagSourceSpec struct { + RPC *RPCConf `json:"rpc,omitempty"` + + InProces *InProcessConf `json:"inProcess,omitempty"` + + // EnvVarPrefix defines the prefix to be applied to all environment variables applied to the sidecar, default FLAGD + // +optional + // +kubebuilder:default:=FLAGD + EnvVarPrefix string `json:"envVarPrefix"` +} + +type InProcessConf struct { + // Port defines the port to listen on, defaults to 8013 + // +kubebuilder:default:=8013 + // +optional + Port int32 `json:"port"` + + // SocketPath defines the unix socket path to listen on + // +optional + SocketPath string `json:"socketPath"` + + // Host + // +kubebuilder:default:=localhost + // +optional + Host string `json:"host"` + + // TLS + // +kubebuilder:default:=false + // +optional + TLS bool `json:"tls"` + + // OfflineFlagSourcePath + // +optional + OfflineFlagSourcePath string `json:"offlineFlagSourcePath"` + + // Selector + // +optional + Selector string `json:"selector"` + + // Cache + // +kubebuilder:default:=lru + // +kubebuilder:validation:Enum:=lru;disabled + // +optional + Cache string `json:"cache"` + + // CacheMaxSize + // +kubebuilder:default:=1000 + // +optional + CacheMaxSize int `json:"cacheMaxSize"` + + //EnvVars + // +optional + EnvVars []corev1.EnvVar `json:"envVars"` +} + +type RPCConf struct { + // ManagemetPort defines the port to serve management on, defaults to 8014 + // +kubebuilder:default:=8014 + // +optional + ManagementPort int32 `json:"managementPort"` + + // Port defines the port to listen on, defaults to 8013 + // +kubebuilder:default:=8013 + // +optional + Port int32 `json:"port"` + + // SocketPath defines the unix socket path to listen on + // +optional + SocketPath string `json:"socketPath"` + + // Evaluator sets an evaluator, defaults to 'json' + // +kubebuilder:default:=json + // +optional + Evaluator string `json:"evaluator"` + + // SyncProviders define the syncProviders and associated configuration to be applied to the sidecar + // +kubebuilder:validation:MinItems=1 + // +optional + Sources []Source `json:"sources"` + + // EnvVars define the env vars to be applied to the sidecar, any env vars in FeatureFlag CRs + // are added at the lowest index, all values will have the EnvVarPrefix applied, default FLAGD + // +optional + EnvVars []corev1.EnvVar `json:"envVars"` + + // SyncProviderArgs are string arguments passed to all sync providers, defined as key values separated by = + // +optional + SyncProviderArgs []string `json:"syncProviderArgs"` + + // DefaultSyncProvider defines the default sync provider + // +optional + // +kubebuilder:default:=kubernetes + // +kubebuilder:validation:Enum:=kubernetes;file;http;grpc;flagd-proxy + DefaultSyncProvider common.SyncProviderType `json:"defaultSyncProvider"` + + // LogFormat allows for the sidecar log format to be overridden, defaults to 'json' + // +optional + // +kubebuilder:default:=json + LogFormat string `json:"logFormat"` + + // RolloutOnChange dictates whether annotated deployments will be restarted when configuration changes are + // detected in this CR, defaults to false + // +optional + // +kubebuilder:default:=false + RolloutOnChange bool `json:"rolloutOnChange"` + + // ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true (enabled). + // +optional + // +kubebuilder:default:=true + ProbesEnabled bool `json:"probesEnabled"` + + // DebugLogging defines whether to enable --debug flag of flagd sidecar. Default false (disabled). + // +optional + // +kubebuilder:default:=false + DebugLogging bool `json:"debugLogging"` + + // OtelCollectorUri defines whether to enable --otel-collector-uri flag of flagd sidecar. Default false (disabled). + // +optional + OtelCollectorUri string `json:"otelCollectorUri"` + + // Resources defines flagd sidecar resources. Default to operator sidecar-cpu-* and sidecar-ram-* flags. + // +optional + Resources corev1.ResourceRequirements `json:"resources"` +} + +type Source struct { + // Source is a URI of the flag sources + Source string `json:"source"` + + // Provider type - kubernetes, http(s), grpc(s) or file + // +optional + // +kubebuilder:default:=kubernetes + // +kubebuilder:validation:Enum:=kubernetes;file;http;grpc;flagd-proxy + Provider common.SyncProviderType `json:"provider"` + + // HttpSyncBearerToken is a bearer token. Used by http(s) sync provider only + // +optional + HttpSyncBearerToken string `json:"httpSyncBearerToken"` + + // TLS - Enable/Disable secure TLS connectivity. Currently used only by GRPC sync + // +optional + // +kubebuilder:default:=false + TLS bool `json:"tls"` + + // CertPath is a path of a certificate to be used by grpc TLS connection + // +optional + CertPath string `json:"certPath"` + + // ProviderID is an identifier to be used in grpc provider + // +optional + ProviderID string `json:"providerID"` + + // Selector is a flag configuration selector used by grpc provider + // +optional + Selector string `json:"selector,omitempty"` + + // Interval is a flag configuration interval in seconds used by http provider + // +optional + Interval uint32 `json:"interval,omitempty"` +} + +// FeatureFlagSourceStatus defines the observed state of FeatureFlagSource +type FeatureFlagSourceStatus struct { +} + +//+kubebuilder:resource:shortName="ffs" +//+kubebuilder:object:root=true +//+kubebuilder:subresource:status +//+kubebuilder:storageversion + +// FeatureFlagSource is the Schema for the FeatureFlagSources API +type FeatureFlagSource struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec FeatureFlagSourceSpec `json:"spec,omitempty"` + Status FeatureFlagSourceStatus `json:"status,omitempty"` +} + +//+kubebuilder:object:root=true + +// FeatureFlagSourceList contains a list of FeatureFlagSource +type FeatureFlagSourceList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []FeatureFlagSource `json:"items"` +} + +func init() { + SchemeBuilder.Register(&FeatureFlagSource{}, &FeatureFlagSourceList{}) +} + +//nolint:gocyclo +func (fc *FeatureFlagSourceSpec) MergeRPC(new *FeatureFlagSourceSpec) { + if new == nil { + return + } + + fc.RPC.ManagementPort = new.RPC.ManagementPort + fc.RPC.Port = new.RPC.Port + fc.RPC.SocketPath = new.RPC.SocketPath + fc.RPC.Evaluator = new.RPC.Evaluator + fc.EnvVarPrefix = new.EnvVarPrefix + fc.RPC.DefaultSyncProvider = new.RPC.DefaultSyncProvider + fc.RPC.LogFormat = new.RPC.LogFormat + fc.RPC.RolloutOnChange = new.RPC.RolloutOnChange + fc.RPC.ProbesEnabled = new.RPC.ProbesEnabled + fc.RPC.DebugLogging = new.RPC.DebugLogging + fc.RPC.OtelCollectorUri = new.RPC.OtelCollectorUri + + if len(new.RPC.Sources) != 0 { + fc.RPC.Sources = append(fc.RPC.Sources, new.RPC.Sources...) + } + if len(new.RPC.EnvVars) != 0 { + fc.RPC.EnvVars = append(fc.RPC.EnvVars, new.RPC.EnvVars...) + } + if len(new.RPC.SyncProviderArgs) != 0 { + fc.RPC.SyncProviderArgs = append(fc.RPC.SyncProviderArgs, new.RPC.SyncProviderArgs...) + } + + fc.InProces = nil +} + +//nolint:gocyclo +func (fc *FeatureFlagSourceSpec) MergeInProcess(new *FeatureFlagSourceSpec) { + if new == nil { + return + } + if len(new.InProces.EnvVars) != 0 { + fc.InProces.EnvVars = append(fc.InProces.EnvVars, new.InProces.EnvVars...) + } + fc.InProces.Port = new.InProces.Port + fc.InProces.SocketPath = new.InProces.SocketPath + fc.InProces.Host = new.InProces.Host + fc.EnvVarPrefix = new.EnvVarPrefix + fc.InProces.OfflineFlagSourcePath = new.InProces.OfflineFlagSourcePath + fc.InProces.Selector = new.InProces.Selector + fc.InProces.Cache = new.InProces.Cache + fc.InProces.CacheMaxSize = new.InProces.CacheMaxSize + fc.InProces.TLS = new.InProces.TLS + + fc.RPC = nil +} + +func (fc *FeatureFlagSourceSpec) ToEnvVarsRPC() []corev1.EnvVar { + envs := []corev1.EnvVar{} + + for _, envVar := range fc.RPC.EnvVars { + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, envVar.Name), + Value: envVar.Value, + }) + } + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, MetricPortEnvVar), + Value: fmt.Sprintf("%d", fc.RPC.ManagementPort), + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, PortEnvVar), + Value: fmt.Sprintf("%d", fc.RPC.Port), + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, EvaluatorEnvVar), + Value: fc.RPC.Evaluator, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, SocketPathEnvVar), + Value: fc.RPC.SocketPath, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, LogFormatEnvVar), + Value: fc.RPC.LogFormat, + }) + + return envs +} + +func (fc *FeatureFlagSourceSpec) ToEnvVarsInProcess() []corev1.EnvVar { + envs := []corev1.EnvVar{} + + for _, envVar := range fc.InProces.EnvVars { + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, envVar.Name), + Value: envVar.Value, + }) + } + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, HostEnvVar), + Value: fc.InProces.Host, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, PortEnvVar), + Value: fmt.Sprintf("%d", fc.InProces.Port), + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, TLSEnvVar), + Value: fmt.Sprintf("%t", fc.InProces.TLS), + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, SocketPathEnvVar), + Value: fc.RPC.SocketPath, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, OfflineFlagSourcePathEnvVar), + Value: fc.InProces.OfflineFlagSourcePath, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, SelectorEnvVar), + Value: fc.InProces.Selector, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, CacheEnvVar), + Value: fc.InProces.Cache, + }) + + envs = append(envs, corev1.EnvVar{ + Name: common.EnvVarKey(fc.EnvVarPrefix, CacheMaxSizeEnvVar), + Value: fmt.Sprintf("%d", fc.InProces.CacheMaxSize), + }) + + return envs +} diff --git a/apis/core/v1beta2/featureflagsource_webhook.go b/apis/core/v1beta2/featureflagsource_webhook.go new file mode 100644 index 000000000..eead0ee9f --- /dev/null +++ b/apis/core/v1beta2/featureflagsource_webhook.go @@ -0,0 +1,64 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta2 + +import ( + "fmt" + + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/webhook" +) + +// log is for logging in this package. +var featureflagsourcelog = logf.Log.WithName("featureflagsource-resource") + +func (r *FeatureFlagSource) SetupWebhookWithManager(mgr ctrl.Manager) error { + return ctrl.NewWebhookManagedBy(mgr). + For(r). + Complete() +} + +//+kubebuilder:webhook:path=/validate-core-openfeature-dev-v1beta2-featureflagsource,mutating=false,failurePolicy=fail,sideEffects=None,groups=core.openfeature.dev,resources=featureflagsources,verbs=create;update,versions=v1beta2,name=vfeatureflagsource.kb.io,admissionReviewVersions=v1 + +var _ webhook.Validator = &FeatureFlagSource{} + +// ValidateCreate implements webhook.Validator so a webhook will be registered for the type +func (r *FeatureFlagSource) ValidateCreate() error { + featureflagsourcelog.Info("validate create", "name", r.Name) + return validateFFS(r) +} + +// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type +func (r *FeatureFlagSource) ValidateUpdate(old runtime.Object) error { + featureflagsourcelog.Info("validate update", "name", r.Name) + return validateFFS(r) +} + +// ValidateDelete implements webhook.Validator so a webhook will be registered for the type +func (r *FeatureFlagSource) ValidateDelete() error { + featureflagsourcelog.Info("validate delete", "name", r.Name) + return nil +} + +func validateFFS(ffs *FeatureFlagSource) error { + if ffs.Spec.InProces != nil && ffs.Spec.RPC != nil { + return fmt.Errorf("rpc and in-process evaluation cannot be set together") + } + return nil +} diff --git a/apis/core/v1beta2/groupversion_info.go b/apis/core/v1beta2/groupversion_info.go new file mode 100644 index 000000000..09f7abcb1 --- /dev/null +++ b/apis/core/v1beta2/groupversion_info.go @@ -0,0 +1,36 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package v1beta2 contains API Schema definitions for the core v1beta2 API group +// +kubebuilder:object:generate=true +// +groupName=core.openfeature.dev +package v1beta2 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" +) + +var ( + // GroupVersion is group version used to register these objects + GroupVersion = schema.GroupVersion{Group: "core.openfeature.dev", Version: "v1beta2"} + + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} + + // AddToScheme adds the types in this group-version to the given scheme. + AddToScheme = SchemeBuilder.AddToScheme +) diff --git a/apis/core/v1beta2/webhook_suite_test.go b/apis/core/v1beta2/webhook_suite_test.go new file mode 100644 index 000000000..ac1eef4b9 --- /dev/null +++ b/apis/core/v1beta2/webhook_suite_test.go @@ -0,0 +1,132 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1beta2 + +import ( + "context" + "crypto/tls" + "fmt" + "net" + "path/filepath" + "testing" + "time" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + admissionv1beta1 "k8s.io/api/admission/v1beta1" + //+kubebuilder:scaffold:imports + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/rest" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/envtest" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" +) + +// These tests use Ginkgo (BDD-style Go testing framework). Refer to +// http://onsi.github.io/ginkgo/ to learn more about Ginkgo. + +var cfg *rest.Config +var k8sClient client.Client +var testEnv *envtest.Environment +var ctx context.Context +var cancel context.CancelFunc + +func TestAPIs(t *testing.T) { + RegisterFailHandler(Fail) + + RunSpecs(t, "Webhook Suite") +} + +var _ = BeforeSuite(func() { + logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) + + ctx, cancel = context.WithCancel(context.TODO()) + + By("bootstrapping test environment") + testEnv = &envtest.Environment{ + CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + ErrorIfCRDPathMissing: false, + WebhookInstallOptions: envtest.WebhookInstallOptions{ + Paths: []string{filepath.Join("..", "..", "..", "config", "webhook")}, + }, + } + + var err error + // cfg is defined in this file globally. + cfg, err = testEnv.Start() + Expect(err).NotTo(HaveOccurred()) + Expect(cfg).NotTo(BeNil()) + + scheme := runtime.NewScheme() + err = AddToScheme(scheme) + Expect(err).NotTo(HaveOccurred()) + + err = admissionv1beta1.AddToScheme(scheme) + Expect(err).NotTo(HaveOccurred()) + + //+kubebuilder:scaffold:scheme + + k8sClient, err = client.New(cfg, client.Options{Scheme: scheme}) + Expect(err).NotTo(HaveOccurred()) + Expect(k8sClient).NotTo(BeNil()) + + // start webhook server using Manager + webhookInstallOptions := &testEnv.WebhookInstallOptions + mgr, err := ctrl.NewManager(cfg, ctrl.Options{ + Scheme: scheme, + Host: webhookInstallOptions.LocalServingHost, + Port: webhookInstallOptions.LocalServingPort, + CertDir: webhookInstallOptions.LocalServingCertDir, + LeaderElection: false, + MetricsBindAddress: "0", + }) + Expect(err).NotTo(HaveOccurred()) + + err = (&FeatureFlagSource{}).SetupWebhookWithManager(mgr) + Expect(err).NotTo(HaveOccurred()) + + //+kubebuilder:scaffold:webhook + + go func() { + defer GinkgoRecover() + err = mgr.Start(ctx) + Expect(err).NotTo(HaveOccurred()) + }() + + // wait for the webhook server to get ready + dialer := &net.Dialer{Timeout: time.Second} + addrPort := fmt.Sprintf("%s:%d", webhookInstallOptions.LocalServingHost, webhookInstallOptions.LocalServingPort) + Eventually(func() error { + conn, err := tls.DialWithDialer(dialer, "tcp", addrPort, &tls.Config{InsecureSkipVerify: true}) + if err != nil { + return err + } + conn.Close() + return nil + }).Should(Succeed()) + +}) + +var _ = AfterSuite(func() { + cancel() + By("tearing down the test environment") + err := testEnv.Stop() + Expect(err).NotTo(HaveOccurred()) +}) diff --git a/apis/core/v1beta2/zz_generated.deepcopy.go b/apis/core/v1beta2/zz_generated.deepcopy.go new file mode 100644 index 000000000..deab53bd1 --- /dev/null +++ b/apis/core/v1beta2/zz_generated.deepcopy.go @@ -0,0 +1,338 @@ +//go:build !ignore_autogenerated + +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by controller-gen. DO NOT EDIT. + +package v1beta2 + +import ( + "encoding/json" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlag) DeepCopyInto(out *FeatureFlag) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlag. +func (in *FeatureFlag) DeepCopy() *FeatureFlag { + if in == nil { + return nil + } + out := new(FeatureFlag) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *FeatureFlag) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagList) DeepCopyInto(out *FeatureFlagList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]FeatureFlag, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagList. +func (in *FeatureFlagList) DeepCopy() *FeatureFlagList { + if in == nil { + return nil + } + out := new(FeatureFlagList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *FeatureFlagList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagSource) DeepCopyInto(out *FeatureFlagSource) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + out.Status = in.Status +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagSource. +func (in *FeatureFlagSource) DeepCopy() *FeatureFlagSource { + if in == nil { + return nil + } + out := new(FeatureFlagSource) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *FeatureFlagSource) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagSourceList) DeepCopyInto(out *FeatureFlagSourceList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]FeatureFlagSource, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagSourceList. +func (in *FeatureFlagSourceList) DeepCopy() *FeatureFlagSourceList { + if in == nil { + return nil + } + out := new(FeatureFlagSourceList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *FeatureFlagSourceList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagSourceSpec) DeepCopyInto(out *FeatureFlagSourceSpec) { + *out = *in + if in.RPC != nil { + in, out := &in.RPC, &out.RPC + *out = new(RPCConf) + (*in).DeepCopyInto(*out) + } + if in.InProces != nil { + in, out := &in.InProces, &out.InProces + *out = new(InProcessConf) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagSourceSpec. +func (in *FeatureFlagSourceSpec) DeepCopy() *FeatureFlagSourceSpec { + if in == nil { + return nil + } + out := new(FeatureFlagSourceSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagSourceStatus) DeepCopyInto(out *FeatureFlagSourceStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagSourceStatus. +func (in *FeatureFlagSourceStatus) DeepCopy() *FeatureFlagSourceStatus { + if in == nil { + return nil + } + out := new(FeatureFlagSourceStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagSpec) DeepCopyInto(out *FeatureFlagSpec) { + *out = *in + in.FlagSpec.DeepCopyInto(&out.FlagSpec) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagSpec. +func (in *FeatureFlagSpec) DeepCopy() *FeatureFlagSpec { + if in == nil { + return nil + } + out := new(FeatureFlagSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FeatureFlagStatus) DeepCopyInto(out *FeatureFlagStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FeatureFlagStatus. +func (in *FeatureFlagStatus) DeepCopy() *FeatureFlagStatus { + if in == nil { + return nil + } + out := new(FeatureFlagStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Flag) DeepCopyInto(out *Flag) { + *out = *in + if in.Variants != nil { + in, out := &in.Variants, &out.Variants + *out = make(json.RawMessage, len(*in)) + copy(*out, *in) + } + if in.Targeting != nil { + in, out := &in.Targeting, &out.Targeting + *out = make(json.RawMessage, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Flag. +func (in *Flag) DeepCopy() *Flag { + if in == nil { + return nil + } + out := new(Flag) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FlagSpec) DeepCopyInto(out *FlagSpec) { + *out = *in + if in.Flags != nil { + in, out := &in.Flags, &out.Flags + *out = make(map[string]Flag, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + if in.Evaluators != nil { + in, out := &in.Evaluators, &out.Evaluators + *out = make(json.RawMessage, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FlagSpec. +func (in *FlagSpec) DeepCopy() *FlagSpec { + if in == nil { + return nil + } + out := new(FlagSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *InProcessConf) DeepCopyInto(out *InProcessConf) { + *out = *in + if in.EnvVars != nil { + in, out := &in.EnvVars, &out.EnvVars + *out = make([]v1.EnvVar, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InProcessConf. +func (in *InProcessConf) DeepCopy() *InProcessConf { + if in == nil { + return nil + } + out := new(InProcessConf) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RPCConf) DeepCopyInto(out *RPCConf) { + *out = *in + if in.Sources != nil { + in, out := &in.Sources, &out.Sources + *out = make([]Source, len(*in)) + copy(*out, *in) + } + if in.EnvVars != nil { + in, out := &in.EnvVars, &out.EnvVars + *out = make([]v1.EnvVar, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.SyncProviderArgs != nil { + in, out := &in.SyncProviderArgs, &out.SyncProviderArgs + *out = make([]string, len(*in)) + copy(*out, *in) + } + in.Resources.DeepCopyInto(&out.Resources) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RPCConf. +func (in *RPCConf) DeepCopy() *RPCConf { + if in == nil { + return nil + } + out := new(RPCConf) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Source) DeepCopyInto(out *Source) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Source. +func (in *Source) DeepCopy() *Source { + if in == nil { + return nil + } + out := new(Source) + in.DeepCopyInto(out) + return out +} diff --git a/apis/go.mod b/apis/go.mod index 231868ad2..29211930b 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -3,28 +3,70 @@ module github.com/open-feature/open-feature-operator/apis go 1.21 require ( + github.com/onsi/ginkgo/v2 v2.6.0 + github.com/onsi/gomega v1.24.1 github.com/stretchr/testify v1.8.4 k8s.io/api v0.26.4 k8s.io/apimachinery v0.26.4 + k8s.io/client-go v0.26.1 sigs.k8s.io/controller-runtime v0.14.6 ) require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/zapr v1.2.3 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect + github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/imdario/mergo v0.3.6 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.7.0 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect + golang.org/x/time v0.3.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/apiextensions-apiserver v0.26.1 // indirect + k8s.io/component-base v0.26.1 // indirect k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/apis/go.sum b/apis/go.sum index 04c7447e1..719534f81 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -1,92 +1,613 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= +github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= +github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= +github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= +gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.26.4 h1:qSG2PmtcD23BkYiWfoYAcak870eF/hE7NNYBYavTT94= k8s.io/api v0.26.4/go.mod h1:WwKEXU3R1rgCZ77AYa7DFksd9/BAIKyOmRlbVxgvjCk= +k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= +k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= k8s.io/apimachinery v0.26.4 h1:rZccKdBLg9vP6J09JD+z8Yr99Ce8gk3Lbi9TCx05Jzs= k8s.io/apimachinery v0.26.4/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= +k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= +k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= +k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= +k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA= sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= diff --git a/common/common.go b/common/common.go index 42ec9d462..0ac9e3bd1 100644 --- a/common/common.go +++ b/common/common.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" appsV1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/common/common_test.go b/common/common_test.go index 155955fbb..437e2f205 100644 --- a/common/common_test.go +++ b/common/common_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" "github.com/stretchr/testify/require" appsV1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/common/flagdinjector/fake/flagdinjector_mock.go b/common/flagdinjector/fake/flagdinjector_mock.go index 150db2954..0401d7cfa 100644 --- a/common/flagdinjector/fake/flagdinjector_mock.go +++ b/common/flagdinjector/fake/flagdinjector_mock.go @@ -7,7 +7,7 @@ package commonmock import ( context "context" gomock "github.com/golang/mock/gomock" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" v1 "k8s.io/api/core/v1" v10 "k8s.io/apimachinery/pkg/apis/meta/v1" reflect "reflect" diff --git a/common/flagdinjector/flagdinjector.go b/common/flagdinjector/flagdinjector.go index 570a3dfb2..a6dbb1dde 100644 --- a/common/flagdinjector/flagdinjector.go +++ b/common/flagdinjector/flagdinjector.go @@ -7,8 +7,8 @@ import ( "time" "github.com/go-logr/logr" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdproxy" "github.com/open-feature/open-feature-operator/common/types" @@ -61,24 +61,23 @@ func (fi *FlagdContainerInjector) InjectFlagd( flagdContainer := fi.generateBasicFlagdContainer(flagSourceConfig) // Enable probes - if flagSourceConfig.ProbesEnabled != nil && *flagSourceConfig.ProbesEnabled { - flagdContainer.LivenessProbe = buildProbe(common.ProbeLiveness, int(flagSourceConfig.ManagementPort)) - flagdContainer.ReadinessProbe = buildProbe(common.ProbeReadiness, int(flagSourceConfig.ManagementPort)) + if flagSourceConfig.RPC.ProbesEnabled { + flagdContainer.LivenessProbe = buildProbe(common.ProbeLiveness, int(flagSourceConfig.RPC.ManagementPort)) + flagdContainer.ReadinessProbe = buildProbe(common.ProbeReadiness, int(flagSourceConfig.RPC.ManagementPort)) } if err := fi.handleSidecarSources(ctx, objectMeta, podSpec, flagSourceConfig, &flagdContainer); err != nil { return err } - flagdContainer.Env = append(flagdContainer.Env, flagSourceConfig.ToEnvVars()...) + flagdContainer.Env = append(flagdContainer.Env, flagSourceConfig.ToEnvVarsRPC()...) for i := 0; i < len(podSpec.Containers); i++ { - cntr := podSpec.Containers[i] - cntr.Env = append(cntr.Env, flagdContainer.Env...) + podSpec.Containers[i].Env = append(podSpec.Containers[i].Env, flagdContainer.Env...) } // append sync provider args - if len(flagSourceConfig.SyncProviderArgs) > 0 { - for _, v := range flagSourceConfig.SyncProviderArgs { + if len(flagSourceConfig.RPC.SyncProviderArgs) > 0 { + for _, v := range flagSourceConfig.RPC.SyncProviderArgs { flagdContainer.Args = append( flagdContainer.Args, "--sync-provider-args", @@ -88,7 +87,7 @@ func (fi *FlagdContainerInjector) InjectFlagd( } // set --debug flag if enabled - if flagSourceConfig.DebugLogging != nil && *flagSourceConfig.DebugLogging { + if flagSourceConfig.RPC.DebugLogging { flagdContainer.Args = append( flagdContainer.Args, "--debug", @@ -96,7 +95,7 @@ func (fi *FlagdContainerInjector) InjectFlagd( } // set --otel-collector-uri flag if enabled - if flagSourceConfig.OtelCollectorUri != "" { + if flagSourceConfig.RPC.OtelCollectorUri != "" { flagdContainer.Args = append( flagdContainer.Args, "--metrics-exporter", @@ -106,16 +105,16 @@ func (fi *FlagdContainerInjector) InjectFlagd( flagdContainer.Args = append( flagdContainer.Args, "--otel-collector-uri", - flagSourceConfig.OtelCollectorUri, + flagSourceConfig.RPC.OtelCollectorUri, ) } - if len(flagSourceConfig.Resources.Requests) != 0 { - flagdContainer.Resources.Requests = flagSourceConfig.Resources.Requests + if len(flagSourceConfig.RPC.Resources.Requests) != 0 { + flagdContainer.Resources.Requests = flagSourceConfig.RPC.Resources.Requests } - if len(flagSourceConfig.Resources.Limits) != 0 { - flagdContainer.Resources.Limits = flagSourceConfig.Resources.Limits + if len(flagSourceConfig.RPC.Resources.Limits) != 0 { + flagdContainer.Resources.Limits = flagSourceConfig.RPC.Resources.Limits } addFlagdContainer(podSpec, flagdContainer) @@ -203,9 +202,9 @@ func (fi *FlagdContainerInjector) handleSidecarSources(ctx context.Context, obje func (fi *FlagdContainerInjector) buildSources(ctx context.Context, objectMeta *metav1.ObjectMeta, flagSourceConfig *api.FeatureFlagSourceSpec, podSpec *corev1.PodSpec, sidecar *corev1.Container) ([]types.SourceConfig, error) { var sourceCfgCollection []types.SourceConfig - for _, source := range flagSourceConfig.Sources { + for _, source := range flagSourceConfig.RPC.Sources { if source.Provider == "" { - source.Provider = flagSourceConfig.DefaultSyncProvider + source.Provider = flagSourceConfig.RPC.DefaultSyncProvider } sourceCfg, err := fi.newSourceConfig(ctx, source, objectMeta, podSpec, sidecar) @@ -394,7 +393,7 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig * Args: []string{ "start", "--management-port", - fmt.Sprintf("%d", flagSourceConfig.ManagementPort), + fmt.Sprintf("%d", flagSourceConfig.RPC.ManagementPort), }, ImagePullPolicy: common.FlagdImagePullPolicy, VolumeMounts: []corev1.VolumeMount{}, @@ -402,7 +401,7 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig * Ports: []corev1.ContainerPort{ { Name: "management", - ContainerPort: flagSourceConfig.ManagementPort, + ContainerPort: flagSourceConfig.RPC.ManagementPort, }, }, SecurityContext: getSecurityContext(), diff --git a/common/flagdinjector/flagdinjector_test.go b/common/flagdinjector/flagdinjector_test.go index 6bb389525..f71c7e5e8 100644 --- a/common/flagdinjector/flagdinjector_test.go +++ b/common/flagdinjector/flagdinjector_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/go-logr/logr/testr" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdproxy" "github.com/open-feature/open-feature-operator/common/utils" @@ -54,9 +54,9 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.DefaultSyncProvider = apicommon.SyncProviderGrpc + flagSourceConfig.RPC.DefaultSyncProvider = apicommon.SyncProviderGrpc - flagSourceConfig.Sources = []api.Source{{}} + flagSourceConfig.RPC.Sources = []api.Source{{}} err := fi.InjectFlagd(context.Background(), &deployment.ObjectMeta, &deployment.Spec.Template.Spec, flagSourceConfig) require.Nil(t, err) @@ -93,11 +93,11 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithDebugLogging(t *te flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.DefaultSyncProvider = apicommon.SyncProviderGrpc + flagSourceConfig.RPC.DefaultSyncProvider = apicommon.SyncProviderGrpc - flagSourceConfig.DebugLogging = utils.TrueVal() + flagSourceConfig.RPC.DebugLogging = true - flagSourceConfig.Sources = []api.Source{{}} + flagSourceConfig.RPC.Sources = []api.Source{{}} err := fi.InjectFlagd(context.Background(), &deployment.ObjectMeta, &deployment.Spec.Template.Spec, flagSourceConfig) require.Nil(t, err) @@ -134,11 +134,11 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithOtelCollectorUri(t flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.DefaultSyncProvider = apicommon.SyncProviderGrpc + flagSourceConfig.RPC.DefaultSyncProvider = apicommon.SyncProviderGrpc - flagSourceConfig.OtelCollectorUri = "localhost:4317" + flagSourceConfig.RPC.OtelCollectorUri = "localhost:4317" - flagSourceConfig.Sources = []api.Source{{}} + flagSourceConfig.RPC.Sources = []api.Source{{}} err := fi.InjectFlagd(context.Background(), &deployment.ObjectMeta, &deployment.Spec.Template.Spec, flagSourceConfig) require.Nil(t, err) @@ -175,9 +175,9 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithResources(t *testi flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.DefaultSyncProvider = apicommon.SyncProviderGrpc + flagSourceConfig.RPC.DefaultSyncProvider = apicommon.SyncProviderGrpc - flagSourceConfig.Resources = corev1.ResourceRequirements{ + flagSourceConfig.RPC.Resources = corev1.ResourceRequirements{ Limits: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), corev1.ResourceMemory: *resource.NewQuantity(256*1<<20, resource.BinarySI), @@ -188,7 +188,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithResources(t *testi }, } - flagSourceConfig.Sources = []api.Source{{}} + flagSourceConfig.RPC.Sources = []api.Source{{}} err := fi.InjectFlagd(context.Background(), &deployment.ObjectMeta, &deployment.Spec.Template.Spec, flagSourceConfig) require.Nil(t, err) @@ -198,7 +198,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithResources(t *testi expectedDeployment.Annotations = nil expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"} - expectedDeployment.Spec.Template.Spec.Containers[0].Resources = flagSourceConfig.Resources + expectedDeployment.Spec.Template.Spec.Containers[0].Resources = flagSourceConfig.RPC.Resources require.Equal(t, expectedDeployment, deployment) } @@ -226,11 +226,11 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithSyncProviderArgs(t flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.SyncProviderArgs = []string{"arg-1", "arg-2"} + flagSourceConfig.RPC.SyncProviderArgs = []string{"arg-1", "arg-2"} - flagSourceConfig.DefaultSyncProvider = apicommon.SyncProviderGrpc + flagSourceConfig.RPC.DefaultSyncProvider = apicommon.SyncProviderGrpc - flagSourceConfig.Sources = []api.Source{{}} + flagSourceConfig.RPC.Sources = []api.Source{{}} err := fi.InjectFlagd(context.Background(), &deployment.ObjectMeta, &deployment.Spec.Template.Spec, flagSourceConfig) require.Nil(t, err) @@ -266,7 +266,7 @@ func TestFlagdContainerInjector_InjectFlagdKubernetesSource(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Source: "my-namespace/server-side", Provider: apicommon.SyncProviderKubernetes, @@ -320,7 +320,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Source: "my-namespace/server-side", Provider: apicommon.SyncProviderFilepath, @@ -406,7 +406,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource_UpdateReferencedConfig flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Source: "my-namespace/server-side", Provider: apicommon.SyncProviderFilepath, @@ -479,7 +479,7 @@ func TestFlagdContainerInjector_InjectHttpSource(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Source: "http://localhost:8013", HttpSyncBearerToken: "my-token", @@ -524,7 +524,7 @@ func TestFlagdContainerInjector_InjectGrpcSource(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Source: "grpc://localhost:8013", Provider: apicommon.SyncProviderGrpc, @@ -571,7 +571,7 @@ func TestFlagdContainerInjector_InjectProxySource_ProxyNotAvailable(t *testing.T flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Provider: apicommon.SyncProviderFlagdProxy, }, @@ -614,7 +614,7 @@ func TestFlagdContainerInjector_InjectProxySource_ProxyNotReady(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Provider: apicommon.SyncProviderFlagdProxy, }, @@ -660,7 +660,7 @@ func TestFlagdContainerInjector_InjectProxySource_ProxyIsReady(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Provider: apicommon.SyncProviderFlagdProxy, }, @@ -745,7 +745,7 @@ func TestFlagdContainerInjector_InjectUnknownSyncProvider(t *testing.T) { flagSourceConfig := getFlagSourceConfigSpec() - flagSourceConfig.Sources = []api.Source{ + flagSourceConfig.RPC.Sources = []api.Source{ { Provider: "unknown", }, @@ -864,19 +864,20 @@ func initContainerInjectionTestEnv() (string, client.WithWatch) { } func getFlagSourceConfigSpec() *api.FeatureFlagSourceSpec { - probesEnabled := true - return &api.FeatureFlagSourceSpec{ - ManagementPort: 8014, - Port: 8013, - EnvVars: []v1.EnvVar{ - { - Name: "my-env-var", - Value: "my-value", + RPC: &api.RPCConf{ + ManagementPort: 8014, + Port: 8013, + EnvVars: []v1.EnvVar{ + { + Name: "my-env-var", + Value: "my-value", + }, }, + + ProbesEnabled: true, }, - EnvVarPrefix: "flagd", - ProbesEnabled: &probesEnabled, + EnvVarPrefix: "flagd", } } @@ -908,10 +909,22 @@ func getExpectedDeployment(namespace string) appsV1.Deployment { Name: "flagd_my-env-var", Value: "my-value", }, + { + Name: "flagd_MANAGEMENT_PORT", + Value: "8014", + }, + { + Name: "flagd_PORT", + Value: "8013", + }, { Name: "flagd_EVALUATOR", Value: "", }, + { + Name: "flagd_SOCKET_PATH", + Value: "", + }, { Name: "flagd_LOG_FORMAT", Value: "", diff --git a/config/crd/bases/core.openfeature.dev_featureflags.yaml b/config/crd/bases/core.openfeature.dev_featureflags.yaml index d41747c6c..e37e0f4ac 100644 --- a/config/crd/bases/core.openfeature.dev_featureflags.yaml +++ b/config/crd/bases/core.openfeature.dev_featureflags.yaml @@ -17,6 +17,73 @@ spec: scope: Namespaced versions: - name: v1beta1 + schema: + openAPIV3Schema: + description: FeatureFlag is the Schema for the featureflags API + properties: + apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources + type: string + kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds + type: string + metadata: + type: object + spec: + description: FeatureFlagSpec defines the desired state of FeatureFlag + properties: + flagSpec: + description: FlagSpec is the structured representation of the feature + flag specification + properties: + $evaluators: + type: object + x-kubernetes-preserve-unknown-fields: true + flags: + additionalProperties: + properties: + defaultVariant: + type: string + state: + enum: + - ENABLED + - DISABLED + type: string + targeting: + description: Targeting is the json targeting rule + type: object + x-kubernetes-preserve-unknown-fields: true + variants: + type: object + x-kubernetes-preserve-unknown-fields: true + required: + - defaultVariant + - state + - variants + type: object + type: object + required: + - flags + type: object + type: object + status: + description: FeatureFlagStatus defines the observed state of FeatureFlag + type: object + type: object + served: true + storage: false + subresources: + status: {} + - name: v1beta2 schema: openAPIV3Schema: description: FeatureFlag is the Schema for the featureflags API diff --git a/config/crd/bases/core.openfeature.dev_featureflagsources.yaml b/config/crd/bases/core.openfeature.dev_featureflagsources.yaml index 424c67633..84b5624e6 100644 --- a/config/crd/bases/core.openfeature.dev_featureflagsources.yaml +++ b/config/crd/bases/core.openfeature.dev_featureflagsources.yaml @@ -310,6 +310,481 @@ spec: type: object type: object served: true + storage: false + subresources: + status: {} + - name: v1beta2 + schema: + openAPIV3Schema: + description: FeatureFlagSource is the Schema for the FeatureFlagSources API + properties: + apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources + type: string + kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds + type: string + metadata: + type: object + spec: + description: FeatureFlagSourceSpec defines the desired state of FeatureFlagSource + properties: + envVarPrefix: + default: FLAGD + description: EnvVarPrefix defines the prefix to be applied to all + environment variables applied to the sidecar, default FLAGD + type: string + inProcess: + properties: + cache: + default: lru + description: Cache + enum: + - lru + - disabled + type: string + cacheMaxSize: + default: 1000 + description: CacheMaxSize + type: integer + envVars: + description: EnvVars + items: + description: EnvVar represents an environment variable present + in a Container. + properties: + name: + description: Name of the environment variable. Must be a + C_IDENTIFIER. + type: string + value: + description: |- + Variable references $(VAR_NAME) are expanded + using the previously defined environment variables in the container and + any service environment variables. If a variable cannot be resolved, + the reference in the input string will be unchanged. Double $$ are reduced + to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. + "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". + Escaped references will never be expanded, regardless of whether the variable + exists or not. + Defaults to "". + type: string + valueFrom: + description: Source for the environment variable's value. + Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. + properties: + key: + description: The key to select. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the ConfigMap or its + key must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + fieldRef: + description: |- + Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['']`, `metadata.annotations['']`, + spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs. + properties: + apiVersion: + description: Version of the schema the FieldPath + is written in terms of, defaults to "v1". + type: string + fieldPath: + description: Path of the field to select in the + specified API version. + type: string + required: + - fieldPath + type: object + x-kubernetes-map-type: atomic + resourceFieldRef: + description: |- + Selects a resource of the container: only resources limits and requests + (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported. + properties: + containerName: + description: 'Container name: required for volumes, + optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string + description: Specifies the output format of the + exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: + description: 'Required: resource to select' + type: string + required: + - resource + type: object + x-kubernetes-map-type: atomic + secretKeyRef: + description: Selects a key of a secret in the pod's + namespace + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + type: object + required: + - name + type: object + type: array + host: + default: localhost + description: Host + type: string + offlineFlagSourcePath: + description: OfflineFlagSourcePath + type: string + port: + default: 8013 + description: Port defines the port to listen on, defaults to 8013 + format: int32 + type: integer + selector: + description: Selector + type: string + socketPath: + description: SocketPath defines the unix socket path to listen + on + type: string + tls: + default: false + description: TLS + type: boolean + type: object + rpc: + properties: + debugLogging: + default: false + description: DebugLogging defines whether to enable --debug flag + of flagd sidecar. Default false (disabled). + type: boolean + defaultSyncProvider: + default: kubernetes + description: DefaultSyncProvider defines the default sync provider + enum: + - kubernetes + - file + - http + - grpc + - flagd-proxy + type: string + envVars: + description: |- + EnvVars define the env vars to be applied to the sidecar, any env vars in FeatureFlag CRs + are added at the lowest index, all values will have the EnvVarPrefix applied, default FLAGD + items: + description: EnvVar represents an environment variable present + in a Container. + properties: + name: + description: Name of the environment variable. Must be a + C_IDENTIFIER. + type: string + value: + description: |- + Variable references $(VAR_NAME) are expanded + using the previously defined environment variables in the container and + any service environment variables. If a variable cannot be resolved, + the reference in the input string will be unchanged. Double $$ are reduced + to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. + "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". + Escaped references will never be expanded, regardless of whether the variable + exists or not. + Defaults to "". + type: string + valueFrom: + description: Source for the environment variable's value. + Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. + properties: + key: + description: The key to select. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the ConfigMap or its + key must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + fieldRef: + description: |- + Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['']`, `metadata.annotations['']`, + spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs. + properties: + apiVersion: + description: Version of the schema the FieldPath + is written in terms of, defaults to "v1". + type: string + fieldPath: + description: Path of the field to select in the + specified API version. + type: string + required: + - fieldPath + type: object + x-kubernetes-map-type: atomic + resourceFieldRef: + description: |- + Selects a resource of the container: only resources limits and requests + (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported. + properties: + containerName: + description: 'Container name: required for volumes, + optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string + description: Specifies the output format of the + exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: + description: 'Required: resource to select' + type: string + required: + - resource + type: object + x-kubernetes-map-type: atomic + secretKeyRef: + description: Selects a key of a secret in the pod's + namespace + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + type: object + required: + - name + type: object + type: array + evaluator: + default: json + description: Evaluator sets an evaluator, defaults to 'json' + type: string + logFormat: + default: json + description: LogFormat allows for the sidecar log format to be + overridden, defaults to 'json' + type: string + managementPort: + default: 8014 + description: ManagemetPort defines the port to serve management + on, defaults to 8014 + format: int32 + type: integer + otelCollectorUri: + description: OtelCollectorUri defines whether to enable --otel-collector-uri + flag of flagd sidecar. Default false (disabled). + type: string + port: + default: 8013 + description: Port defines the port to listen on, defaults to 8013 + format: int32 + type: integer + probesEnabled: + default: true + description: ProbesEnabled defines whether to enable liveness + and readiness probes of flagd sidecar. Default true (enabled). + type: boolean + resources: + description: Resources defines flagd sidecar resources. Default + to operator sidecar-cpu-* and sidecar-ram-* flags. + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rolloutOnChange: + default: false + description: |- + RolloutOnChange dictates whether annotated deployments will be restarted when configuration changes are + detected in this CR, defaults to false + type: boolean + socketPath: + description: SocketPath defines the unix socket path to listen + on + type: string + sources: + description: SyncProviders define the syncProviders and associated + configuration to be applied to the sidecar + items: + properties: + certPath: + description: CertPath is a path of a certificate to be used + by grpc TLS connection + type: string + httpSyncBearerToken: + description: HttpSyncBearerToken is a bearer token. Used + by http(s) sync provider only + type: string + interval: + description: Interval is a flag configuration interval in + seconds used by http provider + format: int32 + type: integer + provider: + default: kubernetes + description: Provider type - kubernetes, http(s), grpc(s) + or file + enum: + - kubernetes + - file + - http + - grpc + - flagd-proxy + type: string + providerID: + description: ProviderID is an identifier to be used in grpc + provider + type: string + selector: + description: Selector is a flag configuration selector used + by grpc provider + type: string + source: + description: Source is a URI of the flag sources + type: string + tls: + default: false + description: TLS - Enable/Disable secure TLS connectivity. + Currently used only by GRPC sync + type: boolean + required: + - source + type: object + minItems: 1 + type: array + syncProviderArgs: + description: SyncProviderArgs are string arguments passed to all + sync providers, defined as key values separated by = + items: + type: string + type: array + type: object + type: object + status: + description: FeatureFlagSourceStatus defines the observed state of FeatureFlagSource + type: object + type: object + served: true storage: true subresources: status: {} diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index b7902f7e0..63e3f65ab 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -10,13 +10,13 @@ patchesStrategicMerge: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD #- patches/webhook_in_featureflags.yaml -#- patches/webhook_in_featureflagsources.yaml +- patches/webhook_in_core_featureflagsources.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD #- patches/cainjection_in_featureflags.yaml -#- patches/cainjection_in_featureflagsources.yaml +- patches/cainjection_in_core_featureflagsources.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch # the following config is for teaching kustomize how to do kustomization for CRDs. diff --git a/config/crd/patches/webhook_in_core_featureflags.yaml b/config/crd/patches/webhook_in_core_featureflags.yaml new file mode 100644 index 000000000..d52034067 --- /dev/null +++ b/config/crd/patches/webhook_in_core_featureflags.yaml @@ -0,0 +1,16 @@ +# The following patch enables a conversion webhook for the CRD +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: featureflags.core.openfeature.dev +spec: + conversion: + strategy: Webhook + webhook: + clientConfig: + service: + namespace: system + name: webhook-service + path: /convert + conversionReviewVersions: + - v1 diff --git a/config/crd/patches/webhook_in_core_featureflagsources.yaml b/config/crd/patches/webhook_in_core_featureflagsources.yaml new file mode 100644 index 000000000..624268108 --- /dev/null +++ b/config/crd/patches/webhook_in_core_featureflagsources.yaml @@ -0,0 +1,16 @@ +# The following patch enables a conversion webhook for the CRD +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: featureflagsources.core.openfeature.dev +spec: + conversion: + strategy: Webhook + webhook: + clientConfig: + service: + namespace: system + name: webhook-service + path: /convert + conversionReviewVersions: + - v1 diff --git a/config/default/webhookcainjection_patch.yaml b/config/default/webhookcainjection_patch.yaml index 28b1826d4..0bfc9dc1f 100644 --- a/config/default/webhookcainjection_patch.yaml +++ b/config/default/webhookcainjection_patch.yaml @@ -1,8 +1,16 @@ # This patch add annotation to admission webhook config and # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize. +--- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: name: mutating-webhook-configuration annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) +--- +apiVersion: admissionregistration.k8s.io/v1 +kind: ValidatingWebhookConfiguration +metadata: + name: validating-webhook-configuration + annotations: + cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5679bb554..4b98e3dd0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -10,5 +10,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: controller - newTag: latest + newName: docker.io/odubajdt/operator + newTag: refactoring-ffs13 diff --git a/config/samples/core_v1beta2_featureflag.yaml b/config/samples/core_v1beta2_featureflag.yaml new file mode 100644 index 000000000..53c848836 --- /dev/null +++ b/config/samples/core_v1beta2_featureflag.yaml @@ -0,0 +1,12 @@ +apiVersion: core.openfeature.dev/v1beta2 +kind: FeatureFlag +metadata: + labels: + app.kubernetes.io/name: featureflag + app.kubernetes.io/instance: featureflag-sample + app.kubernetes.io/part-of: open-feature-operator + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: open-feature-operator + name: featureflag-sample +spec: + # TODO(user): Add fields here diff --git a/config/samples/core_v1beta2_featureflagsource.yaml b/config/samples/core_v1beta2_featureflagsource.yaml new file mode 100644 index 000000000..da3cb9824 --- /dev/null +++ b/config/samples/core_v1beta2_featureflagsource.yaml @@ -0,0 +1,12 @@ +apiVersion: core.openfeature.dev/v1beta2 +kind: FeatureFlagSource +metadata: + labels: + app.kubernetes.io/name: featureflagsource + app.kubernetes.io/instance: featureflagsource-sample + app.kubernetes.io/part-of: open-feature-operator + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: open-feature-operator + name: featureflagsource-sample +spec: + # TODO(user): Add fields here diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 7e202f577..9cf26134e 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -4,6 +4,3 @@ resources: configurations: - kustomizeconfig.yaml - -commonAnnotations: - cert-manager.io/inject-ca-from: open-feature-operator-system/webhook-cert diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 0c9810b95..63844a12d 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -24,3 +24,29 @@ webhooks: resources: - pods sideEffects: NoneOnDryRun +--- +apiVersion: admissionregistration.k8s.io/v1 +kind: ValidatingWebhookConfiguration +metadata: + name: validating-webhook-configuration +webhooks: +- admissionReviewVersions: + - v1 + clientConfig: + service: + name: webhook-service + namespace: system + path: /validate-core-openfeature-dev-v1beta2-featureflagsource + failurePolicy: Fail + name: vfeatureflagsource.kb.io + rules: + - apiGroups: + - core.openfeature.dev + apiVersions: + - v1beta2 + operations: + - CREATE + - UPDATE + resources: + - featureflagsources + sideEffects: None diff --git a/controllers/core/featureflagsource/controller.go b/controllers/core/featureflagsource/controller.go index 71fb340ec..680c29bb8 100644 --- a/controllers/core/featureflagsource/controller.go +++ b/controllers/core/featureflagsource/controller.go @@ -23,7 +23,7 @@ import ( "time" "github.com/go-logr/logr" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdproxy" appsV1 "k8s.io/api/apps/v1" @@ -73,7 +73,7 @@ func (r *FeatureFlagSourceReconciler) Reconcile(ctx context.Context, req ctrl.Re return r.finishReconcile(err, false) } - for _, source := range fsConfig.Spec.Sources { + for _, source := range fsConfig.Spec.RPC.Sources { if source.Provider.IsFlagdProxy() { r.Log.Info(fmt.Sprintf("featureflagsource %s uses flagd-proxy, checking deployment", req.NamespacedName)) if err := r.FlagdProxy.HandleFlagdProxy(ctx); err != nil { @@ -83,7 +83,7 @@ func (r *FeatureFlagSourceReconciler) Reconcile(ctx context.Context, req ctrl.Re } } - if fsConfig.Spec.RolloutOnChange == nil || !*fsConfig.Spec.RolloutOnChange { + if !fsConfig.Spec.RPC.RolloutOnChange { return r.finishReconcile(nil, false) } diff --git a/controllers/core/featureflagsource/controller_test.go b/controllers/core/featureflagsource/controller_test.go index ea4b1e821..ae11f9793 100644 --- a/controllers/core/featureflagsource/controller_test.go +++ b/controllers/core/featureflagsource/controller_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdproxy" commontypes "github.com/open-feature/open-feature-operator/common/types" @@ -198,13 +198,15 @@ func createTestFSConfig(fsConfigName string, testNamespace string, rollout bool, Namespace: testNamespace, }, Spec: api.FeatureFlagSourceSpec{ - Sources: []api.Source{ - { - Source: "my-source", - Provider: provider, + RPC: &api.RPCConf{ + Sources: []api.Source{ + { + Source: "my-source", + Provider: provider, + }, }, + RolloutOnChange: rollout, }, - RolloutOnChange: &rollout, }, } diff --git a/go.mod b/go.mod index 7db73716b..3f46efae4 100644 --- a/go.mod +++ b/go.mod @@ -76,3 +76,5 @@ require ( ) replace golang.org/x/net => golang.org/x/net v0.24.0 + +replace github.com/open-feature/open-feature-operator/apis => github.com/odubajDT/open-feature-operator/apis v0.0.0-20240502114323-f665302882ff diff --git a/go.sum b/go.sum index 7d2534e74..50881efe0 100644 --- a/go.sum +++ b/go.sum @@ -219,12 +219,12 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/odubajDT/open-feature-operator/apis v0.0.0-20240502114323-f665302882ff h1:G4ktUap5NcDdWifQdG1X45MEXtgoktDqLzaw2Sbd430= +github.com/odubajDT/open-feature-operator/apis v0.0.0-20240502114323-f665302882ff/go.mod h1:gBwOKuf73Y9vw3zpyhOgMrGMeyN5EAQ+Vp+JVdUzP5k= github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU= github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/open-feature/open-feature-operator/apis v0.2.40 h1:h2w8vE2KZ9jrYk43zIIpku/GsTMZwzWm14D4K/Z47YI= -github.com/open-feature/open-feature-operator/apis v0.2.40/go.mod h1:I/4tLd5D4JpWpaFZxe2o8R2S1isWGNwHDSC/H5h7o3A= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/main.go b/main.go index 3b8e8fc15..48092100a 100644 --- a/main.go +++ b/main.go @@ -25,6 +25,7 @@ import ( "github.com/kelseyhightower/envconfig" corev1beta1 "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + corev1beta2 "github.com/open-feature/open-feature-operator/apis/core/v1beta2" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdinjector" "github.com/open-feature/open-feature-operator/common/flagdproxy" @@ -74,6 +75,7 @@ var ( func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) + utilruntime.Must(corev1beta2.AddToScheme(scheme)) utilruntime.Must(corev1beta1.AddToScheme(scheme)) //+kubebuilder:scaffold:scheme } @@ -181,6 +183,10 @@ func main() { os.Exit(1) } + if err = (&corev1beta2.FeatureFlagSource{}).SetupWebhookWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create webhook", "webhook", "FeatureFlagSource") + os.Exit(1) + } //+kubebuilder:scaffold:builder hookServer := mgr.GetWebhookServer() podMutator := &webhooks.PodMutator{ diff --git a/webhooks/common.go b/webhooks/common.go index a5ac2eef1..c88a2fdd1 100644 --- a/webhooks/common.go +++ b/webhooks/common.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/types" corev1 "k8s.io/api/core/v1" @@ -60,26 +60,39 @@ func checkOFEnabled(annotations map[string]string) bool { } func NewFeatureFlagSourceSpec(env types.EnvConfig) *api.FeatureFlagSourceSpec { - f := false args := strings.Split(env.SidecarProviderArgs, ",") // use empty array when arguments are not set if len(args) == 1 && args[0] == "" { args = []string{} } return &api.FeatureFlagSourceSpec{ - ManagementPort: int32(env.SidecarManagementPort), - Port: int32(env.SidecarPort), - SocketPath: env.SidecarSocketPath, - Evaluator: env.SidecarEvaluator, - Sources: []api.Source{}, - EnvVars: []corev1.EnvVar{}, - SyncProviderArgs: args, - DefaultSyncProvider: apicommon.SyncProviderType(env.SidecarSyncProvider), - EnvVarPrefix: env.SidecarEnvVarPrefix, - LogFormat: env.SidecarLogFormat, - RolloutOnChange: nil, - DebugLogging: &f, - OtelCollectorUri: "", - ProbesEnabled: &env.SidecarProbesEnabled, + RPC: &api.RPCConf{ + ManagementPort: int32(env.SidecarManagementPort), + Port: int32(env.SidecarPort), + SocketPath: env.SidecarSocketPath, + Evaluator: env.SidecarEvaluator, + Sources: []api.Source{}, + EnvVars: []corev1.EnvVar{}, + SyncProviderArgs: args, + DefaultSyncProvider: apicommon.SyncProviderType(env.SidecarSyncProvider), + + LogFormat: env.SidecarLogFormat, + RolloutOnChange: false, + DebugLogging: false, + OtelCollectorUri: "", + ProbesEnabled: env.SidecarProbesEnabled, + }, + InProces: &api.InProcessConf{ + EnvVars: []corev1.EnvVar{}, + Port: 8013, + SocketPath: "", + Host: "localhost", + OfflineFlagSourcePath: "", + Selector: "", + Cache: "lru", + CacheMaxSize: 1000, + TLS: false, + }, + EnvVarPrefix: env.SidecarEnvVarPrefix, } } diff --git a/webhooks/common_test.go b/webhooks/common_test.go index d94cfbac8..d208629e5 100644 --- a/webhooks/common_test.go +++ b/webhooks/common_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/types" "github.com/stretchr/testify/require" @@ -156,24 +156,34 @@ func Test_NewFeatureFlagSourceSpec(t *testing.T) { SidecarProbesEnabled: true, } - f := false - tt := true - expected := &api.FeatureFlagSourceSpec{ - ManagementPort: int32(80), - Port: int32(88), - SocketPath: "socket-path", - Evaluator: "evaluator", - Sources: []api.Source{}, - EnvVars: []corev1.EnvVar{}, - SyncProviderArgs: []string{"arg1", "arg2", "arg3"}, - DefaultSyncProvider: apicommon.SyncProviderKubernetes, - EnvVarPrefix: "pre", - LogFormat: "log", - RolloutOnChange: nil, - DebugLogging: &f, - OtelCollectorUri: "", - ProbesEnabled: &tt, + RPC: &api.RPCConf{ + ManagementPort: int32(80), + Port: int32(88), + SocketPath: "socket-path", + Evaluator: "evaluator", + Sources: []api.Source{}, + EnvVars: []corev1.EnvVar{}, + SyncProviderArgs: []string{"arg1", "arg2", "arg3"}, + DefaultSyncProvider: apicommon.SyncProviderKubernetes, + LogFormat: "log", + RolloutOnChange: false, + DebugLogging: false, + OtelCollectorUri: "", + ProbesEnabled: true, + }, + InProces: &api.InProcessConf{ + EnvVars: []corev1.EnvVar{}, + Port: 8013, + SocketPath: "", + Host: "localhost", + OfflineFlagSourcePath: "", + Selector: "", + Cache: "lru", + CacheMaxSize: 1000, + TLS: false, + }, + EnvVarPrefix: "pre", } require.Equal(t, expected, NewFeatureFlagSourceSpec(env)) diff --git a/webhooks/pod_webhook.go b/webhooks/pod_webhook.go index 67df5dcf9..107638099 100644 --- a/webhooks/pod_webhook.go +++ b/webhooks/pod_webhook.go @@ -9,7 +9,7 @@ import ( "time" "github.com/go-logr/logr" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" "github.com/open-feature/open-feature-operator/common" "github.com/open-feature/open-feature-operator/common/flagdinjector" "github.com/open-feature/open-feature-operator/common/flagdproxy" @@ -75,25 +75,34 @@ func (m *PodMutator) Handle(ctx context.Context, req admission.Request) admissio } // merge any provided flagd specs - featureFlagSourceSpec, code, err := m.createFSConfigSpec(ctx, req, annotations, pod) + featureFlagSourceSpec, code, err := m.createFSConfigSpec(ctx, req, annotations) if err != nil { return admission.Errored(code, err) } // Check for the correct clusterrolebinding for the pod if we use the Kubernetes mode - if containsK8sProvider(featureFlagSourceSpec.Sources) { + if containsK8sProvider(featureFlagSourceSpec.RPC.Sources) { if err := m.FlagdInjector.EnableClusterRoleBinding(ctx, pod.Namespace, pod.Spec.ServiceAccountName); err != nil { return admission.Denied(err.Error()) } } - if err := m.FlagdInjector.InjectFlagd(ctx, &pod.ObjectMeta, &pod.Spec, featureFlagSourceSpec); err != nil { - if errors.Is(err, common.ErrFlagdProxyNotReady) { - return admission.Denied(err.Error()) + if featureFlagSourceSpec.RPC != nil { + if err := m.FlagdInjector.InjectFlagd(ctx, &pod.ObjectMeta, &pod.Spec, featureFlagSourceSpec); err != nil { + if errors.Is(err, common.ErrFlagdProxyNotReady) { + return admission.Denied(err.Error()) + } + //test + m.Log.Error(err, "unable to inject flagd sidecar") + return admission.Errored(http.StatusInternalServerError, err) + } + } + + if featureFlagSourceSpec.InProces != nil { + envVars := featureFlagSourceSpec.ToEnvVarsRPC() + for i := 0; i < len(pod.Spec.Containers); i++ { + pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, envVars...) } - //test - m.Log.Error(err, "unable to inject flagd sidecar") - return admission.Errored(http.StatusInternalServerError, err) } marshaledPod, err := json.Marshal(pod) @@ -104,7 +113,7 @@ func (m *PodMutator) Handle(ctx context.Context, req admission.Request) admissio return admission.PatchResponseFromRaw(req.Object.Raw, marshaledPod) } -func (m *PodMutator) createFSConfigSpec(ctx context.Context, req admission.Request, annotations map[string]string, pod *corev1.Pod) (*api.FeatureFlagSourceSpec, int32, error) { +func (m *PodMutator) createFSConfigSpec(ctx context.Context, req admission.Request, annotations map[string]string) (*api.FeatureFlagSourceSpec, int32, error) { // Check configuration fscNames := []string{} val, ok := annotations[fmt.Sprintf("%s/%s", common.OpenFeatureAnnotationPrefix, common.FeatureFlagSourceAnnotation)] @@ -122,7 +131,11 @@ func (m *PodMutator) createFSConfigSpec(ctx context.Context, req admission.Reque m.Log.V(1).Info(fmt.Sprintf("FeatureFlagSource could not be found for %s", fscName)) return nil, http.StatusNotFound, err } - featureFlagSourceSpec.Merge(&fc.Spec) + if fc.Spec.RPC != nil { + featureFlagSourceSpec.MergeRPC(&fc.Spec) + } else { + featureFlagSourceSpec.MergeInProcess(&fc.Spec) + } } return featureFlagSourceSpec, 0, nil diff --git a/webhooks/pod_webhook_test.go b/webhooks/pod_webhook_test.go index 8f6956177..ba27751b4 100644 --- a/webhooks/pod_webhook_test.go +++ b/webhooks/pod_webhook_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-logr/logr/testr" "github.com/golang/mock/gomock" - api "github.com/open-feature/open-feature-operator/apis/core/v1beta1" - apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common" + api "github.com/open-feature/open-feature-operator/apis/core/v1beta2" + apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta2/common" "github.com/open-feature/open-feature-operator/common" flagdinjectorfake "github.com/open-feature/open-feature-operator/common/flagdinjector/fake" "github.com/stretchr/testify/require" @@ -317,8 +317,10 @@ func TestPodMutator_Handle(t *testing.T) { Namespace: mutatePodNamespace, }, Spec: api.FeatureFlagSourceSpec{ - Sources: []api.Source{ - {Provider: apicommon.SyncProviderKubernetes}, + RPC: &api.RPCConf{ + Sources: []api.Source{ + {Provider: apicommon.SyncProviderKubernetes}, + }, }, }, }, @@ -356,7 +358,9 @@ func TestPodMutator_Handle(t *testing.T) { Name: featureFlagSourceName, Namespace: mutatePodNamespace, }, - Spec: api.FeatureFlagSourceSpec{}, + Spec: api.FeatureFlagSourceSpec{ + RPC: &api.RPCConf{}, + }, }, ), decoder: decoder, @@ -423,7 +427,9 @@ func TestPodMutator_Handle(t *testing.T) { Name: featureFlagSourceName, Namespace: mutatePodNamespace, }, - Spec: api.FeatureFlagSourceSpec{}, + Spec: api.FeatureFlagSourceSpec{ + RPC: &api.RPCConf{}, + }, }, ), decoder: decoder,