Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,14 @@ image: test-unit clean-controller-gen ## Build the operator image.

.PHONY: bundle
bundle: check-operator-version operator-sdk manifests update-skip-range kustomize ## Generate bundle manifests and metadata, then validate generated files.
@CURRENT_VERSION=$$(grep '^VERSION?=' version.Makefile | cut -d= -f2); \
if [ "$(VERSION)" != "$$CURRENT_VERSION" ]; then \
sed -i "s/^ARG FIO_OLD_VERSION=.*/ARG FIO_OLD_VERSION=\"$$CURRENT_VERSION\"/" bundle.openshift.Dockerfile; \
sed -i 's/^ARG FIO_NEW_VERSION=.*/ARG FIO_NEW_VERSION="$(VERSION)"/' bundle.openshift.Dockerfile; \
fi
sed -i 's/^VERSION?=.*/VERSION?=$(VERSION)/' version.Makefile
sed -i 's/Version = ".*"/Version = "$(VERSION)"/' version/version.go
sed -i 's/version=.*/version=$(VERSION)/' build/Dockerfile.openshift
$(SDK_BIN) generate kustomize manifests --apis-dir=./pkg/apis -q
@echo "kustomize using deployment image $(IMG)"
cd config/manager && $(KUSTOMIZE) edit set image $(APP_NAME)=$(IMG)
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.openshift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LABEL \
com.redhat.component="openshift-file-integrity-operator-container" \
io.openshift.maintainer.product="OpenShift Container Platform" \
io.openshift.maintainer.component="File Integrity Operator" \
version=1.4.0
version=1.4.1
# io.openshift.build.commit.id=98271bc2812881010146f47e4587dcd449b846bd \
# io.openshift.build.source-location=https://github.com/openshift/file-integrity-operator.git \
# io.openshift.build.commit.url=https://github.com/openshift/file-integrity-operator.git/commit/98271bc2812881010146f47e4587dcd449b846bd \
Expand Down
4 changes: 2 additions & 2 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=file-integrity-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.42.2
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

# Labels for testing.
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
Expand Down
4 changes: 2 additions & 2 deletions bundle.openshift.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG FIO_OLD_VERSION="1.3.8"
ARG FIO_NEW_VERSION="1.4.0"
ARG FIO_OLD_VERSION="1.4.0"
ARG FIO_NEW_VERSION="1.4.1"
ARG OPERATOR_IMAGE=""

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring,Security
createdAt: "2026-05-04T11:14:39Z"
olm.skipRange: '>=1.0.0 <1.4.0'
createdAt: "2026-08-04T11:18:37Z"
olm.skipRange: '>=1.0.0 <1.4.1'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-file-integrity
operators.openshift.io/infrastructure-features: '["disconnected", "fips"]'
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-v1.42.2
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
operators.operatorframework.io/builder: operator-sdk-v1.27.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/openshift/file-integrity-operator
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
operatorframework.io/os.zos: supported
name: file-integrity-operator.v1.4.0
name: file-integrity-operator.v1.4.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -327,5 +327,4 @@ spec:
relatedImages:
- image: quay.io/file-integrity-operator/file-integrity-operator:latest
name: operator
version: 1.4.0
replaces: file-integrity-operator.v1.3.8
version: 1.4.1
4 changes: 2 additions & 2 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ annotations:
operators.operatorframework.io.bundle.package.v1: file-integrity-operator
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.bundle.channel.default.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.42.2
operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

# Annotations for testing.
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
Expand Down
4 changes: 2 additions & 2 deletions catalog/preamble.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"package": "file-integrity-operator",
"entries": [
{
"name": "file-integrity-operator.v1.4.0",
"skipRange": ">=1.0.0 <1.4.0"
"name": "file-integrity-operator.v1.4.1",
"skipRange": ">=1.0.0 <1.4.1"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring,Security
olm.skipRange: '>=1.0.0 <1.4.0'
olm.skipRange: '>=1.0.0 <1.4.1'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-file-integrity
operators.openshift.io/infrastructure-features: '["disconnected", "fips"]'
Expand Down
2 changes: 1 addition & 1 deletion version.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# - 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?=1.4.0
VERSION?=1.4.1
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

var (
Version = "1.4.0"
Version = "1.4.1"
)