Skip to content

WIP: CORENET-7045: INFW K8s rebase to 1.36.1 #713

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.

Sign up for GitHub

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

Open
vinnie1110 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: CORENET-7045: INFW K8s rebase to 1.36.1 #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3730c83
K8s update to 1.36.1
vinnie1110 May 27, 2026
1db5a8d
Fix e2e test regex to match | after int name in syslog output when a …
vinnie1110 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.25-openshift-4.22
tag: rhel-9-release-golang-1.26-openshift-5.0
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.25 as builder
FROM golang:1.26 as builder

@coderabbitai coderabbitai Bot May 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Verify unpinned non-Red Hat base images in Dockerfiles
rg -n '^\s*FROM\s+(golang|gcr\.io|docker\.io|ghcr\.io)/[^@[:space:]]+:[^[:space:]]+' --iglob 'Dockerfile*'

Repository: openshift/ingress-node-firewall

Length of output: 127

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Locate Dockerfiles/Containerfiles
echo "== Dockerfiles =="
fd -a -t f -g 'Dockerfile*' -g 'Containerfile*' . | sort

echo
echo "== FROM lines (all Dockerfile* and Containerfile*) =="
fd -a -t f -g 'Dockerfile*' -g 'Containerfile*' . -x \
  rg -n --no-heading '^\s*FROM\s+' | sort

echo
echo "== FROM golang:* (all Dockerfile* and Containerfile*) =="
fd -a -t f -g 'Dockerfile*' -g 'Containerfile*' . -x \
  rg -n --no-heading '^\s*FROM\s+golang:[^@[:space:]]+' --hidden | sort

echo
echo "== Initial targeted regex again (for mutable tags) =="
rg -n '^\s*FROM\s+(golang|gcr\.io|docker\.io|ghcr\.io)/[^@[:space:]]+:[^[:space:]]+' --iglob 'Dockerfile*' || true

Repository: openshift/ingress-node-firewall

Length of output: 1178

🏁 Script executed:

#!/bin/bash
set -euo pipefail

fd -a -t f -g 'Dockerfile*' . | sort | while read -r f; do
  echo "== $f =="
  nl -ba "$f" | rg -n '^\s*FROM\s+' || true
  echo
done

echo "== Focus: golang:1.26 FROM lines (all Dockerfiles) =="
fd -a -t f -g 'Dockerfile*' . | sort | xargs -I{} sh -c 'rg -n "^\s*FROM\s+golang:1\.26\b" "{}" || true'

Repository: openshift/ingress-node-firewall

Length of output: 750

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== Occurrences of exact lowercase variant =="
rg -n --with-filename '^\s*FROM\s+golang:1\.26\s+as\s+builder\b' Dockerfile* Dockerfile* 2>/dev/null || true
rg -n --with-filename '^\s*FROM\s+golang:1\.26\s+as\s+builder\b' . -g 'Dockerfile*' || true

echo
echo "== Occurrences of exact uppercase variant =="
rg -n --with-filename '^\s*FROM\s+golang:1\.26\s+AS\s+builder\b' . -g 'Dockerfile*' || true

Repository: openshift/ingress-node-firewall

Length of output: 341

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== ./Dockerfile: line 1-40 =="
awk 'NR>=1 && NR<=40 {printf "%d:%s\n", NR, $0}' Dockerfile

echo
echo "== ./Dockerfile: FROM lines (full) =="
awk 'match($0,/^\s*FROM/){print NR ":" $0}' Dockerfile

echo
echo "== ./Dockerfile.daemon: FROM lines (full) =="
awk 'match($0,/^\s*FROM/){print NR ":" $0}' Dockerfile.daemon

Repository: openshift/ingress-node-firewall

Length of output: 1319

Review comment

File: Dockerfile
Lines: 2-2

Snippet showing the final state of code at these lines

FROM golang:1.26 as builder

Comment

Pin non-Red Hat base images by digest.

golang:1.26 (builder, line 2) and gcr.io/distroless/static:nonroot (final stage, line 24) are non-Red Hat tag-based images; pin them by @sha256:... to keep builds reproducible and reduce supply-chain risk.

As per coding guidelines for **/{Dockerfile,Containerfile}*: "non-RH images: pin by digest".

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Dockerfile` at line 2, Replace tag-based base images with digest-pinned
references: change the builder FROM golang:1.26 to the corresponding
digest-pinned form (golang:1.26@sha256:...) and the final stage FROM
gcr.io/distroless/static:nonroot to its digest-pinned form
(gcr.io/distroless/static:nonroot@sha256:...); obtain the canonical sha256
digests using a registry inspect command (e.g., docker pull + docker image
inspect or skopeo inspect) for each image and update the Dockerfile to use those
`@sha256` digests to make builds reproducible and reduce supply-chain risk.


WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.daemon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25 AS builder
FROM golang:1.26 AS builder

@coderabbitai coderabbitai Bot May 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# List all FROM lines so pinned vs unpinned bases can be checked quickly
rg -n '^\s*FROM\s+' --iglob 'Dockerfile*'

Repository: openshift/ingress-node-firewall

Length of output: 750

Pin non-RH FROM images in Dockerfile.daemon by digest

  • Dockerfile.daemon:1 uses golang:1.26 without a digest.
  • Dockerfile.daemon:7 uses quay.io/centos/centos:stream8 without a digest.
    Update both to FROM ...@sha256:<digest> as required for non-RH images.
🧰 Tools
🪛 Trivy (0.69.3)

[error] 1-1: Image user should not be 'root'

Specify at least 1 USER command in Dockerfile with non-root user as argument

Rule: DS-0002

Learn more

(IaC/Dockerfile)

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Dockerfile.daemon` at line 1, Replace the two unpinned base images in
Dockerfile.daemon — the FROM golang:1.26 stage and the FROM
quay.io/centos/centos:stream8 stage — with digest-pinned references (e.g., FROM
golang:1.26@sha256:<digest> and FROM
quay.io/centos/centos:stream8@sha256:<digest>); fetch the exact sha256 digests
from the respective registries (Docker Hub for golang, Quay for quay.io/centos)
or by pulling the images and inspecting manifest digests, then update the
Dockerfile lines to use those `@sha256` digests so the builds are reproducible.

WORKDIR /go/src/github.com/openshift/ingress-node-firewall
COPY . .

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.daemon.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder

WORKDIR /go/src/github.com/openshift/ingress-node-firewall
COPY . .
RUN ./hack/build-daemon.sh

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/daemon /usr/bin/
COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/syslog /usr/bin/
CMD ["/usr/bin/daemon"]
4 changes: 2 additions & 2 deletions Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder

WORKDIR /workspace

Expand All @@ -18,7 +18,7 @@ COPY bindata/manifests/ bindata/manifests/
# Build
RUN CGO_ENABLED=0 GO111MODULE=on go build -a -mod=vendor -o manager main.go

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
WORKDIR /
COPY --from=builder /workspace/manager .
COPY --from=builder /workspace/bindata/manifests /bindata/manifests
Expand Down
29 changes: 16 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 4.22.0
VERSION ?= 5.0.0
CSV_VERSION = $(shell echo $(VERSION) | sed 's/v//')
ifeq ($(VERSION), latest)
CSV_VERSION := 0.0.0
Expand Down Expand Up @@ -57,7 +57,7 @@ endif
IMG ?= quay.io/openshift/origin-ingress-node-firewall:latest
DAEMON_IMG ?= quay.io/openshift/origin-ingress-node-firewall-daemon:latest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.32.x
ENVTEST_K8S_VERSION = 1.36.0

# Default namespace
NAMESPACE ?= ingress-node-firewall-system
Expand Down Expand Up @@ -268,8 +268,8 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.20.1
OPERATOR_SDK_VERSION=v1.33.0
CONTROLLER_TOOLS_VERSION ?= v0.21.0
OPERATOR_SDK_VERSION=v1.42.2

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand All @@ -285,7 +285,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) GOFLAGS="" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.20
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) GOFLAGS="" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.24

.PHONY: bundle
bundle: operator-sdk manifests kustomize ## Generate bundle manifests and metadata, then validate generated files.
Expand Down Expand Up @@ -363,17 +363,20 @@ OPM = $(shell which opm)
endif
endif

PHONY: operator-sdk
operator-sdk: ## Get the current operator-sdk binary, If there isn't any, we'll use the GOBIN path.
ifeq (, $(shell which operator-sdk))
.PHONY: operator-sdk
OPERATOR_SDK = $(LOCALBIN)/operator-sdk
operator-sdk: ## Download operator-sdk locally if necessary.
ifeq (,$(wildcard $(OPERATOR_SDK)))
ifeq (,$(shell which operator-sdk 2>/dev/null))
@{ \
set -e ;\
curl -Lk https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_linux_amd64 > $(GOBIN)/operator-sdk ;\
chmod u+x $(GOBIN)/operator-sdk ;\
mkdir -p $(LOCALBIN) ;\
curl -Lk https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_linux_amd64 > $(OPERATOR_SDK) ;\
chmod u+x $(OPERATOR_SDK) ;\
Comment on lines +374 to +375

@coderabbitai coderabbitai Bot May 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Remove curl -k when downloading operator-sdk binary.

Using -k disables TLS cert verification for a supply-chain download path and enables MITM risk in CI/dev environments.

Suggested fix 
-	curl -Lk https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_linux_amd64 > $(OPERATOR_SDK) ;\
+	curl -L https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_linux_amd64 > $(OPERATOR_SDK) ;\
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Makefile` around lines 374 - 375, The curl invocation that downloads the
operator-sdk binary uses the insecure -k flag; update the Makefile command that
references OPERATOR_SDK_VERSION and writes to $(OPERATOR_SDK) to remove -k and
use a safer curl invocation (e.g., keep -L, add --fail and --show-error) so TLS
cert verification is enforced and failures are visible; ensure the subsequent
chmod u+x $(OPERATOR_SDK) step remains unchanged.

}
OPERATOR_SDK=$(GOBIN)/operator-sdk
else
OPERATOR_SDK=$(shell which operator-sdk)
OPERATOR_SDK = $(shell which operator-sdk)
endif
endif

.PHONY: generate-daemon-manifest
Expand Down Expand Up @@ -419,7 +422,7 @@ catalog-push: ## Push a catalog image.
$(MAKE) docker-push IMG=$(CATALOG_IMG)

CILIUM_EBPF_VERSION := v0.18.0
GOLANGCI_LINT_VERSION = v1.54.2
GOLANGCI_LINT_VERSION = v1.64.8
CLANG ?= clang
CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
GOOS ?= linux
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ make undeploy-samples

You need to install the following packages:

operator-sdk 1.33.0
operator-sdk 1.42.2

controller-gen v0.20.1+
Comment on lines +71 to 73

@coderabbitai coderabbitai Bot May 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Keep tool prerequisite versions aligned with Makefile defaults.

README now lists operator-sdk 1.42.2, but still advertises controller-gen v0.20.1+ while Makefile was bumped to v0.21.0. Please update this line to avoid contributor environment drift.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@README.md` around lines 71 - 73, README lists mismatched tool versions: it
shows "operator-sdk 1.42.2" and "controller-gen v0.20.1+" while the Makefile was
bumped to v0.21.0; update the README entry for "controller-gen v0.20.1+" to
"controller-gen v0.21.0" so the README's prerequisite versions match the
Makefile defaults.


Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var (
GroupVersion = schema.GroupVersion{Group: "ingressnodefirewall.openshift.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:staticcheck

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=ingress-node-firewall
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.42.2
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
50 changes: 8 additions & 42 deletions bundle/manifests/ingress-node-firewall.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-ingress-node-firewall:latest
createdAt: "2025-09-04T08:08:17Z"
createdAt: "2026-05-27T11:28:23Z"
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "true"
features.operators.openshift.io/proxy-aware: "false"
features.operators.openshift.io/tls-profiles: "false"
features.operators.openshift.io/token-auth-aws: "false"
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.11.0 <4.22.0'
olm.skipRange: '>=4.11.0 <5.0.0'
operatorframework.io/suggested-namespace: openshift-ingress-node-firewall
operators.operatorframework.io/builder: operator-sdk-v1.34.1
operators.operatorframework.io/builder: operator-sdk-v1.42.2
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/openshift/ingress-node-firewall
support: Red Hat
Expand All @@ -106,7 +106,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: ingress-node-firewall.v4.22.0
name: ingress-node-firewall.v5.0.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -167,43 +167,7 @@ spec:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallconfigs/finalizers
verbs:
- update
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallnodestates
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewalls
verbs:
- create
Expand All @@ -216,12 +180,14 @@ spec:
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallconfigs/finalizers
- ingressnodefirewalls/finalizers
verbs:
- update
- apiGroups:
- ingressnodefirewall.openshift.io
resources:
- ingressnodefirewallconfigs/status
- ingressnodefirewalls/status
verbs:
- get
Expand Down Expand Up @@ -448,7 +414,7 @@ spec:
- ingressnodefirewall
labels:
olm-owner-enterprise-app: ingress-node-firewall
olm-status-descriptors: ingress-node-firewall.v4.22.0
olm-status-descriptors: ingress-node-firewall.v5.0.0
links:
- name: Ingress Node Firewall
url: https://github.com/openshift/ingress-node-firewall
Expand All @@ -458,7 +424,7 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc
version: 4.22.0
version: 5.0.0
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
21 changes: 4 additions & 17 deletions bundle/manifests/ingressnodefirewall.openshift.io_ingressnodefirewallconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.21.0
creationTimestamp: null
name: ingressnodefirewallconfigs.ingressnodefirewall.openshift.io
spec:
Expand Down Expand Up @@ -70,16 +70,8 @@ spec:
description: Conditions show the current state of the Ingress Node
Firewall Config resource
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -120,12 +112,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/ingressnodefirewall.openshift.io_ingressnodefirewallnodestates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.21.0
creationTimestamp: null
name: ingressnodefirewallnodestates.ingressnodefirewall.openshift.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/ingressnodefirewall.openshift.io_ingressnodefirewalls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.21.0
creationTimestamp: null
name: ingressnodefirewalls.ingressnodefirewall.openshift.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ annotations:
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: ingress-node-firewall
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
operators.operatorframework.io.metrics.builder: operator-sdk-v1.42.2
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/ingressnodefirewall.openshift.io_ingressnodefirewallconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.1
controller-gen.kubebuilder.io/version: v0.21.0
name: ingressnodefirewallconfigs.ingressnodefirewall.openshift.io
spec:
group: ingressnodefirewall.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/ingressnodefirewall.openshift.io_ingressnodefirewallnodestates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.1
controller-gen.kubebuilder.io/version: v0.21.0
name: ingressnodefirewallnodestates.ingressnodefirewall.openshift.io
spec:
group: ingressnodefirewall.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/ingressnodefirewall.openshift.io_ingressnodefirewalls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.20.1
controller-gen.kubebuilder.io/version: v0.21.0
name: ingressnodefirewalls.ingressnodefirewall.openshift.io
spec:
group: ingressnodefirewall.openshift.io
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/ingress-node-firewall.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "false"
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.11.0 <4.22.0'
olm.skipRange: '>=4.11.0 <5.0.0'
operatorframework.io/suggested-namespace: openshift-ingress-node-firewall
repository: https://github.com/openshift/ingress-node-firewall
support: Red Hat
Expand Down Expand Up @@ -71,7 +71,7 @@ spec:
- ingressnodefirewall
labels:
olm-owner-enterprise-app: ingress-node-firewall
olm-status-descriptors: ingress-node-firewall.v4.22.0
olm-status-descriptors: ingress-node-firewall.v5.0.0
links:
- name: Ingress Node Firewall
url: https://github.com/openshift/ingress-node-firewall
Expand Down
2 changes: 1 addition & 1 deletion config/olm-install/install-resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
namespace: ingress-node-firewall-system
spec:
displayName: Ingress Node Firewall Index
image: quay.io/openshift/ingress-nodefw/ingress-node-firewall-index:v4.22.0
image: quay.io/openshift/ingress-nodefw/ingress-node-firewall-index:v5.0.0
publisher: github.com/openshift/ingress-node-firewall
sourceType: grpc
---
Expand Down
Loading