OCPBUGS-82973: Sync 25-3-2026

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.21
+  tag: rhel-9-release-golang-1.25-openshift-4.22

.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Checkout Source
         uses: actions/checkout@v4
       - name: Run Gosec Security Scanner
-        uses: securego/gosec@v2.22.3
+        uses: securego/gosec@v2.24.7
         with:
           args: -exclude-dir e2etest -severity medium ./...
 
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
@@ -64,6 +64,9 @@ jobs:
       - name: Helm doc generate
         uses: docker://jnorwood/helm-docs:v1.10.0
 
+      - name: Check helm docs comments
+        run: make verify-helm-docs-comments
+
       - name: Check if docs are different
         run: make checkuncommitted
 
@@ -80,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
@@ -95,7 +98,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
@@ -149,7 +152,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
@@ -206,7 +209,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true

.github/workflows/publish.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.24.2 AS builder
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.25.8 AS builder
 ARG GIT_COMMIT=dev
 ARG GIT_BRANCH=dev
 WORKDIR $GOPATH/frr-k8s

Makefile

@@ -74,7 +74,10 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 .PHONY: build
 build: manifests generate fmt vet ## Build k8s-frr binary.
-	go build -o bin/frr-k8s cmd/main.go
+	go build -v -o bin/frr-k8s ./cmd/frr-k8s-controller
+	go build -v -o bin/frr-metrics ./cmd/metrics
+	go build -v -o bin/frr-status ./cmd/status
+	go build -v -o bin/statuscleaner ./cmd/statuscleaner
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
@@ -123,15 +126,15 @@ export KUBECONFIG=$(KUBECONFIG_PATH)
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.0.0
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.17.3
 KUBECTL_VERSION ?= v1.27.0
 GINKGO_VERSION ?= v2.19.0
 GOLANGCI_LINT_VERSION ?= v2.2.2
 KIND_VERSION ?= v0.27.0
 KIND_CLUSTER_NAME ?= frr-k8s
 HELM_VERSION ?= v3.12.3
 HELM_DOCS_VERSION ?= v1.10.0
-APIDOCSGEN_VERSION ?= v0.0.12
+APIDOCSGEN_VERSION ?= v0.3.0
 
 .PHONY: install
 install: kubectl manifests kustomize ## Install CRDs into the K8s cluster specified in $KUBECONFIG_PATH.
@@ -287,9 +290,17 @@ generate-all-in-one: manifests kustomize ## Create manifests
 	$(KUSTOMIZE) build config/prometheus > config/all-in-one/frr-k8s-prometheus.yaml
 
 .PHONY: helm-docs
-helm-docs:
+helm-docs: ## Generate helm documentation
 	docker run --rm -v $$(pwd):/app -w /app jnorwood/helm-docs:$(HELM_DOCS_VERSION) helm-docs
 
+.PHONY: verify-helm-docs-comments
+verify-helm-docs-comments: ## Check that all documented helm values have comments
+	@if grep -n -E '\|\s*\|\s*$$' charts/frr-k8s/README.md; then \
+	  echo "Error: Found helm values with empty descriptions in README.md"; \
+	  echo "Please add documentation comments for all helm values int charts/frr-k8s/values.yaml"; \
+	  exit 1; \
+	fi
+
 .PHONY: api-docs
 api-docs: crd-ref-docs
 	$(APIDOCSGEN) --config hack/crd-ref-docs.yaml --max-depth 10 --source-path "./api" --renderer=markdown --output-path ./API-DOCS.md

api/v1beta1/frrconfiguration_types.go

@@ -59,7 +59,7 @@ type RawConfig struct {
 type BGPConfig struct {
 	// Routers is the list of routers we want FRR to configure (one per VRF).
 	// +optional
-	Routers []Router `json:"routers"`
+	Routers []Router `json:"routers,omitempty"`
 	// BFDProfiles is the list of bfd profiles to be used when configuring the neighbors.
 	// +optional
 	BFDProfiles []BFDProfile `json:"bfdProfiles,omitempty"`
@@ -195,9 +195,10 @@ type Neighbor struct {
 	// +optional
 	ToReceive Receive `json:"toReceive,omitempty"`
 
-	// To set if we want to disable MP BGP that will separate IPv4 and IPv6 route exchanges into distinct BGP sessions.
+	// DisableMP is no longer used and has no effect.
+	// Use DualStackAddressFamily instead to enable the neighbor for both IPv4 and IPv6 address families.
 	//
-	// Deprecated: DisableMP is deprecated in favor of dualStackAddressFamily.
+	// Deprecated: This field is ignored. Use DualStackAddressFamily instead.
 	// +optional
 	// +kubebuilder:default:=false
 	DisableMP bool `json:"disableMP,omitempty"`

api/v1beta1/frrk8sconfiguration.go

@@ -0,0 +1,62 @@
+/*
+Copyright 2023.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// FRRK8sConfigurationSpec defines the desired state of FRRK8sConfiguration.
+type FRRK8sConfigurationSpec struct {
+	// LogLevel sets the logging verbosity for the FRR-K8s components at runtime.
+	// When configured, this value overrides the defaults established by the --log-level CLI flag.
+	// Valid values are: all, debug, info, warn, error, none.
+	// +kubebuilder:validation:Enum=all;debug;info;warn;error;none
+	// +optional
+	LogLevel string `json:"logLevel,omitempty"`
+}
+
+// FRRK8sConfigurationStatus defines the observed state of FRRK8sConfiguration.
+type FRRK8sConfigurationStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//nolint
+//+genclient
+
+// FRRK8sConfiguration holds the FRR Operator configuration with global
+// settings for the K8s and FRR.
+type FRRK8sConfiguration struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   FRRK8sConfigurationSpec   `json:"spec,omitempty"`
+	Status FRRK8sConfigurationStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// FRRK8sConfigurationList contains a list of FRRK8sConfiguration.
+type FRRK8sConfigurationList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []FRRK8sConfiguration `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&FRRK8sConfiguration{}, &FRRK8sConfigurationList{})
+}