feat: release APIs and Operator independently (#541)

thisthat · web-flow · commit 7b1af42ac41e · 2023-11-15T10:49:44.000-05:00
Signed-off-by: Giovanni Liva &lt;giovanni.liva@dynatrace.com&gt;
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -12,6 +12,10 @@ env:
   IMAGE_NAME: ${{ github.repository }}
   GITHUB_PAGES_BRANCH: gh-pages
 
+defaults:
+  run:
+    shell: bash
+
 permissions:
   contents: read
 
@@ -30,6 +34,7 @@ jobs:
           command: manifest
           token: ${{secrets.GITHUB_TOKEN}}
           default-branch: main
+
     outputs:
       release_created: ${{ steps.release.outputs.release_created }}
       release_tag_name: ${{ steps.release.outputs.tag_name }}
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,4 @@
 {
-  ".": "0.2.36"
+  ".": "0.2.36",
+  "apis": "0.2.36"
 }
diff --git a/apis/core/v1alpha1/common/common.go b/apis/core/v1alpha1/common/common.go
@@ -0,0 +1,23 @@
+package common
+
+import "fmt"
+
+func TrueVal() *bool {
+	b := true
+	return &b
+}
+
+func FalseVal() *bool {
+	b := false
+	return &b
+}
+
+// unique string used to create unique volume mount and file name
+func FeatureFlagConfigurationId(namespace, name string) string {
+	return fmt.Sprintf("%s_%s", namespace, name)
+}
+
+// unique key (and filename) for configMap data
+func FeatureFlagConfigurationConfigMapKey(namespace, name string) string {
+	return fmt.Sprintf("%s.flagd.json", FeatureFlagConfigurationId(namespace, name))
+}
diff --git a/apis/core/v1alpha1/featureflagconfiguration_types.go b/apis/core/v1alpha1/featureflagconfiguration_types.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"github.com/open-feature/open-feature-operator/pkg/utils"
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -114,7 +114,7 @@ func (ff *FeatureFlagConfiguration) GetReference() metav1.OwnerReference {
 		Kind:       ff.Kind,
 		Name:       ff.Name,
 		UID:        ff.UID,
-		Controller: utils.TrueVal(),
+		Controller: common.TrueVal(),
 	}
 }
 
@@ -129,7 +129,7 @@ func (ff *FeatureFlagConfiguration) GenerateConfigMap(name string, namespace str
 			OwnerReferences: references,
 		},
 		Data: map[string]string{
-			utils.FeatureFlagConfigurationConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,
+			common.FeatureFlagConfigurationConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,
 		},
 	}
 }
diff --git a/apis/core/v1alpha1/featureflagconfiguration_types_test.go b/apis/core/v1alpha1/featureflagconfiguration_types_test.go
@@ -1,9 +1,9 @@
 package v1alpha1
 
 import (
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"testing"
 
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,7 +21,7 @@ func Test_FeatureFlagConfiguration(t *testing.T) {
 					Kind:       "kind",
 					Name:       "ffconf1",
 					UID:        types.UID("5"),
-					Controller: utils.TrueVal(),
+					Controller: common.TrueVal(),
 				},
 			},
 		},
@@ -38,7 +38,7 @@ func Test_FeatureFlagConfiguration(t *testing.T) {
 			Kind:       "kind",
 			Name:       "ffconf1",
 			UID:        types.UID("5"),
-			Controller: utils.TrueVal(),
+			Controller: common.TrueVal(),
 		},
 	}
 
@@ -47,7 +47,7 @@ func Test_FeatureFlagConfiguration(t *testing.T) {
 		Kind:       ffConfig.Kind,
 		Name:       ffConfig.Name,
 		UID:        ffConfig.UID,
-		Controller: utils.TrueVal(),
+		Controller: common.TrueVal(),
 	}, ffConfig.GetReference())
 
 	require.Equal(t, corev1.ConfigMap{
diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types.go b/apis/core/v1alpha1/flagsourceconfiguration_types.go
@@ -18,11 +18,11 @@ package v1alpha1
 
 import (
 	"fmt"
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"os"
 	"strconv"
 	"strings"
 
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -212,7 +212,7 @@ func NewFlagSourceConfigurationSpec() (*FlagSourceConfigurationSpec, error) {
 		EnvVarPrefix:        defaultSidecarEnvVarPrefix,
 		LogFormat:           defaultLogFormat,
 		RolloutOnChange:     nil,
-		DebugLogging:        utils.FalseVal(),
+		DebugLogging:        common.FalseVal(),
 		OtelCollectorUri:    "",
 	}
 
diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types_test.go b/apis/core/v1alpha1/flagsourceconfiguration_types_test.go
@@ -1,9 +1,9 @@
 package v1alpha1
 
 import (
+	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"
 	"testing"
 
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 )
@@ -116,9 +116,9 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			},
 			SyncProviderArgs:    []string{"arg1", "arg2"},
 			DefaultSyncProvider: SyncProviderKubernetes,
-			RolloutOnChange:     utils.TrueVal(),
-			ProbesEnabled:       utils.TrueVal(),
-			DebugLogging:        utils.TrueVal(),
+			RolloutOnChange:     common.TrueVal(),
+			ProbesEnabled:       common.TrueVal(),
+			DebugLogging:        common.TrueVal(),
 			OtelCollectorUri:    "",
 		},
 	}
@@ -157,9 +157,9 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			},
 			SyncProviderArgs:    []string{"arg1", "arg2"},
 			DefaultSyncProvider: SyncProviderKubernetes,
-			RolloutOnChange:     utils.TrueVal(),
-			ProbesEnabled:       utils.TrueVal(),
-			DebugLogging:        utils.TrueVal(),
+			RolloutOnChange:     common.TrueVal(),
+			ProbesEnabled:       common.TrueVal(),
+			DebugLogging:        common.TrueVal(),
 			OtelCollectorUri:    "",
 		},
 	}, ff_old)
@@ -192,9 +192,9 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			},
 			SyncProviderArgs:    []string{"arg3", "arg4"},
 			DefaultSyncProvider: SyncProviderFilepath,
-			RolloutOnChange:     utils.FalseVal(),
-			ProbesEnabled:       utils.FalseVal(),
-			DebugLogging:        utils.FalseVal(),
+			RolloutOnChange:     common.FalseVal(),
+			ProbesEnabled:       common.FalseVal(),
+			DebugLogging:        common.FalseVal(),
 			OtelCollectorUri:    "",
 		},
 	}
@@ -245,9 +245,9 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			},
 			SyncProviderArgs:    []string{"arg1", "arg2", "arg3", "arg4"},
 			DefaultSyncProvider: SyncProviderFilepath,
-			RolloutOnChange:     utils.FalseVal(),
-			ProbesEnabled:       utils.FalseVal(),
-			DebugLogging:        utils.FalseVal(),
+			RolloutOnChange:     common.FalseVal(),
+			ProbesEnabled:       common.FalseVal(),
+			DebugLogging:        common.FalseVal(),
 			OtelCollectorUri:    "",
 		},
 	}, ff_old)
@@ -283,8 +283,8 @@ func Test_FLagSourceConfiguration_NewFlagSourceConfigurationSpec(t *testing.T) {
 		DefaultSyncProvider: SyncProviderKubernetes,
 		EnvVarPrefix:        "val6",
 		LogFormat:           "val5",
-		ProbesEnabled:       utils.TrueVal(),
-		DebugLogging:        utils.FalseVal(),
+		ProbesEnabled:       common.TrueVal(),
+		DebugLogging:        common.FalseVal(),
 		OtelCollectorUri:    "",
 	}, fs)
 
diff --git a/apis/core/v1alpha2/common/common.go b/apis/core/v1alpha2/common/common.go
@@ -4,3 +4,13 @@ import "errors"
 
 var ErrCannotCastFlagSourceConfiguration = errors.New("cannot cast FlagSourceConfiguration to v1alpha2")
 var ErrCannotCastFeatureFlagConfiguration = errors.New("cannot cast FeatureFlagConfiguration to v1alpha2")
+
+func TrueVal() *bool {
+	b := true
+	return &b
+}
+
+func FalseVal() *bool {
+	b := false
+	return &b
+}
diff --git a/apis/core/v1alpha2/flagsourceconfiguration_conversion.go b/apis/core/v1alpha2/flagsourceconfiguration_conversion.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -48,7 +47,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 		LogFormat:           src.Spec.LogFormat,
 		DefaultSyncProvider: v1alpha1.SyncProviderType(src.Spec.DefaultSyncProvider),
 		ProbesEnabled:       src.Spec.ProbesEnabled,
-		DebugLogging:        utils.FalseVal(),
+		DebugLogging:        common.FalseVal(),
 		OtelCollectorUri:    src.Spec.OtelCollectorUri,
 	}
 	return nil
diff --git a/apis/core/v1alpha2/flagsourceconfiguration_conversion_test.go b/apis/core/v1alpha2/flagsourceconfiguration_conversion_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -64,7 +63,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
 					SyncProviderArgs:    []string{"provider", "arg"},
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 					OtelCollectorUri:    "",
 				},
 			},
@@ -155,7 +154,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					EnvVarPrefix:        "",
 					RolloutOnChange:     nil,
 					SyncProviderArgs:    []string{"provider", "arg"},
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 					OtelCollectorUri:    "",
 				},
 			},
diff --git a/apis/core/v1alpha3/common/common.go b/apis/core/v1alpha3/common/common.go
@@ -3,3 +3,13 @@ package common
 import "errors"
 
 var ErrCannotCastFlagSourceConfiguration = errors.New("cannot cast FlagSourceConfiguration to v1alpha3")
+
+func TrueVal() *bool {
+	b := true
+	return &b
+}
+
+func FalseVal() *bool {
+	b := false
+	return &b
+}
diff --git a/apis/core/v1alpha3/flagsourceconfiguration_conversion_test.go b/apis/core/v1alpha3/flagsourceconfiguration_conversion_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha3/common"
-	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -63,7 +62,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 					OtelCollectorUri:    "",
 				},
 			},
@@ -105,7 +104,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 				},
 			},
 		},
@@ -179,7 +178,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 				},
 			},
 			wantErr: false,
@@ -220,7 +219,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
-					DebugLogging:        utils.FalseVal(),
+					DebugLogging:        common.FalseVal(),
 					OtelCollectorUri:    "",
 				},
 			},
diff --git a/apis/go.mod b/apis/go.mod
@@ -0,0 +1,66 @@
+module github.com/open-feature/open-feature-operator/apis
+
+go 1.19
+
+require (
+	github.com/stretchr/testify v1.8.4
+	k8s.io/api v0.26.4
+	k8s.io/apimachinery v0.26.4
+	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-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
+	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/client-go 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
diff --git a/go.mod b/go.mod
diff --git a/release-please-config.json b/release-please-config.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- ".": "0.2.36"`
	`2`	`+ ".": "0.2.36",`
	`3`	`+ "apis": "0.2.36"`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package v1alpha1`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/open-feature/open-feature-operator/pkg/utils"`
	`20`	`+ "github.com/open-feature/open-feature-operator/apis/core/v1alpha1/common"`
`21`	`21`	`corev1 "k8s.io/api/core/v1"`
`22`	`22`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`23`	`23`	`)`
`@@ -114,7 +114,7 @@ func (ff *FeatureFlagConfiguration) GetReference() metav1.OwnerReference {`
`114`	`114`	`Kind: ff.Kind,`
`115`	`115`	`Name: ff.Name,`
`116`	`116`	`UID: ff.UID,`
`117`		`- Controller: utils.TrueVal(),`
	`117`	`+ Controller: common.TrueVal(),`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`@@ -129,7 +129,7 @@ func (ff *FeatureFlagConfiguration) GenerateConfigMap(name string, namespace str`
`129`	`129`	`OwnerReferences: references,`
`130`	`130`	`},`
`131`	`131`	`Data: map[string]string{`
`132`		`- utils.FeatureFlagConfigurationConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,`
	`132`	`+ common.FeatureFlagConfigurationConfigMapKey(namespace, name): ff.Spec.FeatureFlagSpec,`
`133`	`133`	`},`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"`
`23`	`23`	`"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"`
`24`		`- "github.com/open-feature/open-feature-operator/pkg/utils"`
`25`	`24`	`"sigs.k8s.io/controller-runtime/pkg/conversion"`
`26`	`25`	`)`
`27`	`26`
`@@ -48,7 +47,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {`
`48`	`47`	`LogFormat: src.Spec.LogFormat,`
`49`	`48`	`DefaultSyncProvider: v1alpha1.SyncProviderType(src.Spec.DefaultSyncProvider),`
`50`	`49`	`ProbesEnabled: src.Spec.ProbesEnabled,`
`51`		`- DebugLogging: utils.FalseVal(),`
	`50`	`+ DebugLogging: common.FalseVal(),`
`52`	`51`	`OtelCollectorUri: src.Spec.OtelCollectorUri,`
`53`	`52`	`}`
`54`	`53`	`return nil`