chore: use renovate to bump flagd version (#395)

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
open-feature · Mar 20, 2023 · fd5b072 · fd5b072
1 parent 42f9b00
commit fd5b072
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 314 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -39,13 +39,6 @@ jobs:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
       - name: Run linter
         run: make lint
-      # # Ensure there is no diff when make update-flagd is run 
-      - run: make update-flagd
-      - name: Check version diff 
-        run: |
-          if [ ! -z "$(git status --porcelain)" ]; then exit 0; fi
-          echo "flagd version replace did not produce diff. Please revert this change in apis/core/v1alpha1/flagsourceconfiguration_types.go"
-          exit 1
 
   test:
     name: Component Tests
@@ -120,8 +113,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Update flagd tag
-        run: make update-flagd
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -68,10 +68,6 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@master
 
-      - name: Update flagd image version
-        run: |
-          make update-flagd
-
       - name: Build
         uses: docker/build-push-action@v4
         with:
@@ -119,7 +115,6 @@ jobs:
           with:
             go-version: ${{ env.DEFAULT_GO_VERSION }}
         - run: |
-            make update-flagd
             go mod tidy
             make controller-gen
             IMG=ghcr.io/open-feature/open-feature-operator:${{ needs.release-please.outputs.release_tag_name }} make helm-package

diff --git a/Makefile b/Makefile
@@ -6,9 +6,8 @@ ARCH?=amd64
 IMG?=$(RELEASE_REGISTRY)/$(RELEASE_IMAGE)
 # customize overlay to be used in the build, DEFAULT or HELM
 KUSTOMIZE_OVERLAY ?= DEFAULT
-# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-FLAGD_VERSION=v0.4.4
 CHART_VERSION=v0.2.31# x-release-please-version
+# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26.1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -50,11 +49,8 @@ help: ## Display this help.
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
-.PHONY: update-flagd
-update-flagd:
-	./hack/update-flagd.sh ${FLAGD_VERSION}
 .PHONY: generate
-generate: update-flagd controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: fmt
@@ -102,7 +98,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go
 
 .PHONY: docker-build
-docker-build: update-flagd clean  ## Build docker image with the manager.
+docker-build: clean  ## Build docker image with the manager.
 	DOCKER_BUILDKIT=1 docker build \
 		-t $(IMG)-$(ARCH)  \
 		--platform linux/$(ARCH) \

diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types.go b/apis/core/v1alpha1/flagsourceconfiguration_types.go
@@ -29,31 +29,30 @@ import (
 type SyncProviderType string
 
 const (
-	SidecarEnvVarPrefix              string = "SIDECAR_ENV_VAR_PREFIX"
-	InputConfigurationEnvVarPrefix   string = "SIDECAR"
-	SidecarMetricPortEnvVar          string = "METRICS_PORT"
-	SidecarPortEnvVar                string = "PORT"
-	SidecarSocketPathEnvVar          string = "SOCKET_PATH"
-	SidecarEvaluatorEnvVar           string = "EVALUATOR"
-	SidecarImageEnvVar               string = "IMAGE"
-	SidecarVersionEnvVar             string = "TAG"
-	SidecarProviderArgsEnvVar        string = "PROVIDER_ARGS"
-	SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER"
-	SidecarLogFormatEnvVar           string = "LOG_FORMAT"
-	SidecarProbesEnabledVar          string = "PROBES_ENABLED"
-	defaultSidecarEnvVarPrefix       string = "FLAGD"
-	DefaultMetricPort                int32  = 8014
-	defaultPort                      int32  = 8013
-	defaultSocketPath                string = ""
-	defaultEvaluator                 string = "json"
-	defaultImage                     string = "ghcr.io/open-feature/flagd"
-	// INPUT_FLAGD_VERSION` is replaced in the `update-flagd` Makefile target
-	defaultTag             string           = "INPUT_FLAGD_VERSION"
-	defaultLogFormat       string           = "json"
-	defaultProbesEnabled   bool             = true
-	SyncProviderKubernetes SyncProviderType = "kubernetes"
-	SyncProviderFilepath   SyncProviderType = "filepath"
-	SyncProviderHttp       SyncProviderType = "http"
+	SidecarEnvVarPrefix              string           = "SIDECAR_ENV_VAR_PREFIX"
+	InputConfigurationEnvVarPrefix   string           = "SIDECAR"
+	SidecarMetricPortEnvVar          string           = "METRICS_PORT"
+	SidecarPortEnvVar                string           = "PORT"
+	SidecarSocketPathEnvVar          string           = "SOCKET_PATH"
+	SidecarEvaluatorEnvVar           string           = "EVALUATOR"
+	SidecarImageEnvVar               string           = "IMAGE"
+	SidecarVersionEnvVar             string           = "TAG"
+	SidecarProviderArgsEnvVar        string           = "PROVIDER_ARGS"
+	SidecarDefaultSyncProviderEnvVar string           = "SYNC_PROVIDER"
+	SidecarLogFormatEnvVar           string           = "LOG_FORMAT"
+	SidecarProbesEnabledVar          string           = "PROBES_ENABLED"
+	defaultSidecarEnvVarPrefix       string           = "FLAGD"
+	DefaultMetricPort                int32            = 8014
+	defaultPort                      int32            = 8013
+	defaultSocketPath                string           = ""
+	defaultEvaluator                 string           = "json"
+	defaultImage                     string           = "ghcr.io/open-feature/flagd"
+	defaultTag                       string           = "v0.4.4"
+	defaultLogFormat                 string           = "json"
+	defaultProbesEnabled             bool             = true
+	SyncProviderKubernetes           SyncProviderType = "kubernetes"
+	SyncProviderFilepath             SyncProviderType = "filepath"
+	SyncProviderHttp                 SyncProviderType = "http"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!

diff --git a/go.mod b/go.mod
@@ -17,15 +17,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute v1.5.0 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	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
@@ -37,7 +28,6 @@ require (
 	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-jwt/jwt/v4 v4.2.0 // 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
@@ -63,7 +53,6 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
 	golang.org/x/sys v0.5.0 // indirect