Skip to content

Commit 8d10a25

Browse files
authored
Merge branch 'main' into feat/mutatingwebhookconfig
2 parents 92a5d3d + 8ae6ee8 commit 8d10a25

File tree

7 files changed

+23
-5
lines changed

7 files changed

+23
-5
lines changed

.github/workflows/pr-checks.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ jobs:
7575
cache-from: type=gha,scope=${{ github.ref_name }}-ofo
7676
cache-to: type=gha,scope=${{ github.ref_name }}-ofo
7777
- name: Run Trivy vulnerability scanner
78-
uses: aquasecurity/trivy-action@0.27.0
78+
uses: aquasecurity/trivy-action@0.28.0
7979
with:
8080
input: ${{ github.workspace }}/open-feature-operator-local.tar
81-
format: "template"
82-
template: "@/contrib/sarif.tpl"
81+
format: "sarif"
8382
output: "trivy-results.sarif"
8483
severity: "CRITICAL,HIGH"
84+
env:
85+
# use an alternative trivvy db to avoid rate limits
86+
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
8587
- name: Upload Trivy scan results to GitHub Security tab
8688
uses: github/codeql-action/upload-sarif@v2
8789
with:

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
ref: ${{ needs.release-please.outputs.release_tag_name }}
5353

5454
- name: Log in to the Container registry
55-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
55+
uses: docker/login-action@06895751d15a223ec091bea144ad5c7f50d228d0
5656
with:
5757
registry: ${{ env.REGISTRY }}
5858
username: ${{ github.actor }}

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ and deploying to your cluster. Please be aware that it is using the cluster your
3636

3737
Some part of the project docs may be autogenerated and require running a script.
3838

39+
#### Re-generating helm docs after modifying the chart
40+
` ./.github/scripts/generate-helm-docs.sh`
41+
3942
#### CRDs Docs
4043
If you modified or added crds to the project, then you should recreate the crds.md file. To do so run:
4144

chart/open-feature-operator/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ The command removes all the Kubernetes components associated with the chart and
148148

149149
| Name | Description | Value |
150150
| ------------------------------------------ | ------------------------------------------------------------------------------- | ---------------------------------- |
151+
| `flagdProxyConfiguration.replicaCount` | sets the number of replicas for the flagd-proxy deployment. | `1` |
151152
| `flagdProxyConfiguration.port` | Sets the port to expose the sync API on. | `8015` |
152153
| `flagdProxyConfiguration.managementPort` | Sets the port to expose the management API on. | `8016` |
153154
| `flagdProxyConfiguration.image.repository` | Sets the image for the flagd-proxy deployment. | `ghcr.io/open-feature/flagd-proxy` |
@@ -177,7 +178,7 @@ The command removes all the Kubernetes components associated with the chart and
177178
| `controllerManager.kubeRbacProxy.resources.requests.cpu` | Sets cpu resource requests for kube-rbac-proxy. | `5m` |
178179
| `controllerManager.kubeRbacProxy.resources.requests.memory` | Sets memory resource requests for kube-rbac-proxy. | `64Mi` |
179180
| `controllerManager.manager.image.repository` | Sets the image for the operator. | `ghcr.io/open-feature/open-feature-operator` |
180-
| `controllerManager.manager.image.tag` | Sets the version tag for the operator. | `v0.7.2` |
181+
| `controllerManager.manager.image.tag` | Sets the version tag for the operator. | `v0.8.0` |
181182
| `controllerManager.manager.resources.limits.cpu` | Sets cpu resource limits for operator. | `500m` |
182183
| `controllerManager.manager.resources.limits.memory` | Sets memory resource limits for operator. | `128Mi` |
183184
| `controllerManager.manager.resources.requests.cpu` | Sets cpu resource requests for operator. | `10m` |

chart/open-feature-operator/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ inProcessConfiguration:
9090

9191
## @section Flagd-proxy configuration
9292
flagdProxyConfiguration:
93+
## @param flagdProxyConfiguration.replicaCount sets the number of replicas for the flagd-proxy deployment.
94+
replicaCount: 1
9395
## @param flagdProxyConfiguration.port Sets the port to expose the sync API on.
9496
port: 8015
9597
## @param flagdProxyConfiguration.managementPort Sets the port to expose the management API on.

config/overlays/helm/manager.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ spec:
6161
value: "{{ .Values.sidecarConfiguration.probesEnabled }}"
6262
- name: FLAGD_PROXY_IMAGE
6363
value: "{{ .Values.flagdProxyConfiguration.image.repository }}"
64+
- name: FLAGD_PROXY_REPLICA_COUNT
65+
value: "{{ .Values.flagdProxyConfiguration.replicaCount }}"
6466
- name: FLAGD_PROXY_TAG
6567
value: "{{ .Values.flagdProxyConfiguration.image.tag }}"
6668
- name: FLAGD_PROXY_PORT

config/rbac/role.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,11 @@ rules:
147147
verbs:
148148
- get
149149
- update
150+
- apiGroups:
151+
- policy
152+
resources:
153+
- poddisruptionbudgets
154+
verbs:
155+
- list
156+
- create
157+
- watch

0 commit comments

Comments
 (0)