-
Notifications
You must be signed in to change notification settings - Fork 24
OCPBUGS-113338: Align to upstream - 1109 #342
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # syntax=docker/dockerfile:1.2 | ||
|
|
||
| FROM --platform=$BUILDPLATFORM docker.io/golang:1.25.7 AS builder | ||
| FROM --platform=$BUILDPLATFORM docker.io/golang:1.26.8 AS builder | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🔒 Security & Privacy | 🛡️ Analyzed with Security Review | 🟠 Major | ⚡ Quick win 🧩 Analysis chain🏁 Script executed: sed -n '1,80p' DockerfileRepository: openshift/metallb-operator Length of output: 2246 Security Misconfiguration Reachability: Internal Pin the builder image by digest.
🤖 Prompt for AI AgentsSource: Path instructions |
||
| ARG GIT_COMMIT=dev | ||
| ARG GIT_BRANCH=dev | ||
|
|
||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,11 +64,15 @@ spec: | |
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| {{- if or .Values.prometheus.scrapeAnnotations .Values.prometheus.serviceMonitor.speaker.annotations }} | ||
| annotations: | ||
| {{- if .Values.prometheus.scrapeAnnotations }} | ||
| prometheus.io/scrape: "true" | ||
| prometheus.io/scheme: "https" | ||
| {{- if .Values.prometheus.serviceMonitor.speaker.annotations }} | ||
| {{ toYaml .Values.prometheus.serviceMonitor.speaker.annotations | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.prometheus.serviceMonitor.speaker.annotations }} | ||
| {{- toYaml .Values.prometheus.serviceMonitor.speaker.annotations | nindent 4 }} | ||
| {{- end }} | ||
|
Comment on lines
+73
to
+75
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win Keep ServiceMonitor annotations on ServiceMonitor objects. The chart defines 🤖 Prompt for AI Agents |
||
| {{- end }} | ||
| labels: | ||
| name: speaker-monitor-service | ||
|
|
@@ -139,11 +143,15 @@ spec: | |
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| {{- if or .Values.prometheus.scrapeAnnotations .Values.prometheus.serviceMonitor.controller.annotations }} | ||
| annotations: | ||
| {{- if .Values.prometheus.scrapeAnnotations }} | ||
| prometheus.io/scrape: "true" | ||
| prometheus.io/scheme: "https" | ||
| {{- if .Values.prometheus.serviceMonitor.controller.annotations }} | ||
| {{ toYaml .Values.prometheus.serviceMonitor.controller.annotations | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.prometheus.serviceMonitor.controller.annotations }} | ||
| {{- toYaml .Values.prometheus.serviceMonitor.controller.annotations | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| name: controller-monitor-service | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,7 +80,7 @@ prometheus: | |
| # - sourceLabels: [__meta_kubernetes_pod_node_name] | ||
| # separator: ; | ||
| # regex: ^(.*)$ | ||
| # target_label: nodename | ||
| # targetLabel: nodename | ||
| # replacement: $1 | ||
| # action: replace | ||
|
|
||
|
|
@@ -131,7 +131,7 @@ prometheus: | |
| # - sourceLabels: [__meta_kubernetes_pod_node_name] | ||
| # separator: ; | ||
| # regex: ^(.*)$ | ||
| # target_label: nodename | ||
| # targetLabel: nodename | ||
| # replacement: $1 | ||
| # action: replace | ||
|
|
||
|
|
@@ -210,6 +210,7 @@ controller: | |
| ## maxSurge: 25% | ||
| ## maxUnavailable: 25% | ||
| ## | ||
| revisionHistoryLimit: 10 | ||
| strategy: | ||
| type: RollingUpdate | ||
| serviceAccount: | ||
|
|
@@ -274,6 +275,8 @@ speaker: | |
| ignoreExcludeLB: false | ||
| # -- BGP debounce timeout for FRR configuration reloads, in milliseconds. Only applies when BGP type is frr. Default (when unset) is 3000 ms. This feature is experimental | ||
| bgpDebounceTimeout: null | ||
| # -- Interval in seconds for periodic gratuitous ARP/NDP announcements. Unset or 0 (default) disables periodic announcements. | ||
| gratuitousARPInterval: null | ||
|
Comment on lines
+278
to
+279
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win Validate the speaker interval in the Helm schema. The template forwards 🤖 Prompt for AI Agents |
||
|
|
||
| image: | ||
| repository: quay.io/metallb/speaker | ||
|
|
@@ -282,6 +285,7 @@ speaker: | |
| ## @param speaker.updateStrategy.type Speaker daemonset strategy type | ||
| ## ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/ | ||
| ## | ||
| revisionHistoryLimit: 10 | ||
| updateStrategy: | ||
| ## StrategyType | ||
| ## Can be set to RollingUpdate or OnDelete | ||
|
|
@@ -344,6 +348,24 @@ speaker: | |
| pullPolicy: | ||
| metricsPort: 9121 | ||
| resources: {} | ||
| # -- Path to the tini binary inside the FRR container. Override this | ||
| # when using an FRR image (e.g. Docker Hardened Images) that places | ||
| # tini at a different location. | ||
| tiniPath: /sbin/tini | ||
| # -- Path to the docker-start script inside the FRR container. Override | ||
| # this when using an FRR image (e.g. Docker Hardened Images) that places | ||
| # docker-start at a different location. | ||
| dockerStartPath: /usr/lib/frr/docker-start | ||
| # -- Security context for the FRR container. | ||
| securityContext: | ||
| readOnlyRootFilesystem: true | ||
| allowPrivilegeEscalation: false | ||
| capabilities: | ||
| add: | ||
| - NET_ADMIN | ||
| - NET_RAW | ||
| - SYS_ADMIN | ||
| - NET_BIND_SERVICE | ||
|
Comment on lines
+360
to
+368
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🔒 Security & Privacy | 🛡️ Analyzed with Security Review | 🟠 Major | ⚡ Quick win 🧩 Analysis chain🤖 get_repo_knowledge executed:
Length of output: 5963 🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- values.yaml ---'
cat -n bindata/deployment/helm/metallb/values.yaml | sed -n '340,380p'
printf '%s\n' '--- FRR template security context ---'
rg -n -C 12 'securityContext|frr' bindata/deployment/helm/metallb/templates/speaker.yaml
printf '%s\n' '--- related security context values and documentation ---'
rg -n -C 4 'runAsNonRoot|capabilities:|drop:|allowPrivilegeEscalation|frr.securityContext|securityContext' bindata/deployment/helm/metallb README.md docs 2>/dev/null | head -240Repository: openshift/metallb-operator Length of output: 38662 Security Misconfiguration CWE: CWE-250 Drop default capabilities in the FRR security context. The FRR container adds capabilities without dropping the runtime defaults. Set 🤖 Prompt for AI AgentsSource: Path instructions |
||
|
|
||
| reloader: | ||
| resources: {} | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win
Use the repository toolchain for release validation.
actions/setup-go@v6resolves1.26to a patch release and setsGOTOOLCHAIN=local. If that patch is older thango1.26.8, Go commands can fail becausego.modrequirestoolchain go1.26.8. A newer patch also differs from the Docker builder, which usesgolang:1.26.8. Setgo-version: "1.26.8"or usego-version-file: go.mod.🧰 Tools
🪛 zizmor (1.29.0)
[warning] 1-158: overly broad permissions (excessive-permissions): default permissions used due to no permissions: block
(excessive-permissions)
[warning] 13-70: overly broad permissions (excessive-permissions): default permissions used due to no permissions: block
(excessive-permissions)
🤖 Prompt for AI Agents