Skip to content

Commit fd5b072

Browse files
odubajDTodubajDT
authored
chore: use renovate to bump flagd version (#395)
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
1 parent 42f9b00 commit fd5b072

File tree

8 files changed

+35
-314
lines changed

8 files changed

+35
-314
lines changed

‎.github/workflows/pr-checks.yml

-9
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ jobs:
3939
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
4040
- name: Run linter
4141
run: make lint
42-
# # Ensure there is no diff when make update-flagd is run
43-
- run: make update-flagd
44-
- name: Check version diff
45-
run: |
46-
if [ ! -z "$(git status --porcelain)" ]; then exit 0; fi
47-
echo "flagd version replace did not produce diff. Please revert this change in apis/core/v1alpha1/flagsourceconfiguration_types.go"
48-
exit 1
4942

5043
test:
5144
name: Component Tests
@@ -120,8 +113,6 @@ jobs:
120113
steps:
121114
- name: Checkout
122115
uses: actions/checkout@v3
123-
- name: Update flagd tag
124-
run: make update-flagd
125116
- name: Set up QEMU
126117
uses: docker/setup-qemu-action@master
127118
with:

‎.github/workflows/release-please.yml

-5
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ jobs:
6868
id: buildx
6969
uses: docker/setup-buildx-action@master
7070

71-
- name: Update flagd image version
72-
run: |
73-
make update-flagd
74-
7571
- name: Build
7672
uses: docker/build-push-action@v4
7773
with:
@@ -119,7 +115,6 @@ jobs:
119115
with:
120116
go-version: ${{ env.DEFAULT_GO_VERSION }}
121117
- run: |
122-
make update-flagd
123118
go mod tidy
124119
make controller-gen
125120
IMG=ghcr.io/open-feature/open-feature-operator:${{ needs.release-please.outputs.release_tag_name }} make helm-package

‎Makefile

+3-7
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ ARCH?=amd64
66
IMG?=$(RELEASE_REGISTRY)/$(RELEASE_IMAGE)
77
# customize overlay to be used in the build, DEFAULT or HELM
88
KUSTOMIZE_OVERLAY ?= DEFAULT
9-
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
10-
FLAGD_VERSION=v0.4.4
119
CHART_VERSION=v0.2.31# x-release-please-version
10+
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
1211
ENVTEST_K8S_VERSION = 1.26.1
1312

1413
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -50,11 +49,8 @@ help: ## Display this help.
5049
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
5150
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
5251

53-
.PHONY: update-flagd
54-
update-flagd:
55-
./hack/update-flagd.sh ${FLAGD_VERSION}
5652
.PHONY: generate
57-
generate: update-flagd controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
53+
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
5854
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
5955

6056
.PHONY: fmt
@@ -102,7 +98,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
10298
go run ./main.go
10399

104100
.PHONY: docker-build
105-
docker-build: update-flagd clean ## Build docker image with the manager.
101+
docker-build: clean ## Build docker image with the manager.
106102
DOCKER_BUILDKIT=1 docker build \
107103
-t $(IMG)-$(ARCH) \
108104
--platform linux/$(ARCH) \

‎apis/core/v1alpha1/flagsourceconfiguration_types.go

+24-25
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,30 @@ import (
2929
type SyncProviderType string
3030

3131
const (
32-
SidecarEnvVarPrefix string = "SIDECAR_ENV_VAR_PREFIX"
33-
InputConfigurationEnvVarPrefix string = "SIDECAR"
34-
SidecarMetricPortEnvVar string = "METRICS_PORT"
35-
SidecarPortEnvVar string = "PORT"
36-
SidecarSocketPathEnvVar string = "SOCKET_PATH"
37-
SidecarEvaluatorEnvVar string = "EVALUATOR"
38-
SidecarImageEnvVar string = "IMAGE"
39-
SidecarVersionEnvVar string = "TAG"
40-
SidecarProviderArgsEnvVar string = "PROVIDER_ARGS"
41-
SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER"
42-
SidecarLogFormatEnvVar string = "LOG_FORMAT"
43-
SidecarProbesEnabledVar string = "PROBES_ENABLED"
44-
defaultSidecarEnvVarPrefix string = "FLAGD"
45-
DefaultMetricPort int32 = 8014
46-
defaultPort int32 = 8013
47-
defaultSocketPath string = ""
48-
defaultEvaluator string = "json"
49-
defaultImage string = "ghcr.io/open-feature/flagd"
50-
// INPUT_FLAGD_VERSION` is replaced in the `update-flagd` Makefile target
51-
defaultTag string = "INPUT_FLAGD_VERSION"
52-
defaultLogFormat string = "json"
53-
defaultProbesEnabled bool = true
54-
SyncProviderKubernetes SyncProviderType = "kubernetes"
55-
SyncProviderFilepath SyncProviderType = "filepath"
56-
SyncProviderHttp SyncProviderType = "http"
32+
SidecarEnvVarPrefix string = "SIDECAR_ENV_VAR_PREFIX"
33+
InputConfigurationEnvVarPrefix string = "SIDECAR"
34+
SidecarMetricPortEnvVar string = "METRICS_PORT"
35+
SidecarPortEnvVar string = "PORT"
36+
SidecarSocketPathEnvVar string = "SOCKET_PATH"
37+
SidecarEvaluatorEnvVar string = "EVALUATOR"
38+
SidecarImageEnvVar string = "IMAGE"
39+
SidecarVersionEnvVar string = "TAG"
40+
SidecarProviderArgsEnvVar string = "PROVIDER_ARGS"
41+
SidecarDefaultSyncProviderEnvVar string = "SYNC_PROVIDER"
42+
SidecarLogFormatEnvVar string = "LOG_FORMAT"
43+
SidecarProbesEnabledVar string = "PROBES_ENABLED"
44+
defaultSidecarEnvVarPrefix string = "FLAGD"
45+
DefaultMetricPort int32 = 8014
46+
defaultPort int32 = 8013
47+
defaultSocketPath string = ""
48+
defaultEvaluator string = "json"
49+
defaultImage string = "ghcr.io/open-feature/flagd"
50+
defaultTag string = "v0.4.4"
51+
defaultLogFormat string = "json"
52+
defaultProbesEnabled bool = true
53+
SyncProviderKubernetes SyncProviderType = "kubernetes"
54+
SyncProviderFilepath SyncProviderType = "filepath"
55+
SyncProviderHttp SyncProviderType = "http"
5756
)
5857

5958
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!

‎go.mod

-11
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ require (
1717
)
1818

1919
require (
20-
cloud.google.com/go/compute v1.5.0 // indirect
21-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
22-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
23-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
24-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
25-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
26-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
27-
github.com/PuerkitoBio/purell v1.1.1 // indirect
28-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2920
github.com/beorn7/perks v1.0.1 // indirect
3021
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3122
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -37,7 +28,6 @@ require (
3728
github.com/go-openapi/jsonreference v0.20.0 // indirect
3829
github.com/go-openapi/swag v0.19.14 // indirect
3930
github.com/gogo/protobuf v1.3.2 // indirect
40-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
4131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4232
github.com/golang/protobuf v1.5.2 // indirect
4333
github.com/google/gnostic v0.5.7-v3refs // indirect
@@ -63,7 +53,6 @@ require (
6353
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
6454
go.uber.org/atomic v1.10.0 // indirect
6555
go.uber.org/multierr v1.8.0 // indirect
66-
golang.org/x/crypto v0.1.0 // indirect
6756
golang.org/x/net v0.7.0 // indirect
6857
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
6958
golang.org/x/sys v0.5.0 // indirect

0 commit comments

Comments
 (0)