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
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Build the manager binary
FROM registry.access.redhat.com/ubi8-minimal:latest as builder
FROM registry.access.redhat.com/ubi9-minimal:latest as builder
ARG GO_PLATFORM=amd64
ARG GO_VERSION_ARG
ENV PATH=$PATH:/usr/local/go/bin
RUN microdnf install tar gzip
RUN microdnf install -y tar gzip

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -ldflags="-s -w" -a -o mana

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

ARG USER_ID=65532
ARG GROUP_ID=65532
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - 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.5.0
OPERATOR_SDK_RELEASE_VERSION ?= v1.38.0
OPERATOR_SDK_RELEASE_VERSION ?= v1.39.2

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
Expand Down Expand Up @@ -147,21 +147,21 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= 5.4.2
KUSTOMIZE_VERSION ?= 5.4.3
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/kustomize/v${KUSTOMIZE_VERSION}/hack/install_kustomize.sh"
.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
$(KUSTOMIZE): $(LOCALBIN)
test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@v$(KUSTOMIZE_VERSION)

CONTROLLER_TOOLS_VERSION ?= 0.15.0
CONTROLLER_TOOLS_VERSION ?= 0.16.5
.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
$(CONTROLLER_GEN): $(LOCALBIN)
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_TOOLS_VERSION)

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.30.0
ENVTEST_K8S_VERSION = 1.31.0
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=runtime-component
LABEL operators.operatorframework.io.bundle.channels.v1=v1.5
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.5
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.2
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

Expand Down
655 changes: 224 additions & 431 deletions bundle/manifests/rc.app.stacks_runtimecomponents.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/manifests/rc.app.stacks_runtimeoperations.yaml
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.15.0
controller-gen.kubebuilder.io/version: v0.16.5
creationTimestamp: null
labels:
app.kubernetes.io/instance: runtime-component-operator
Expand Down
70 changes: 29 additions & 41 deletions bundle/manifests/runtime-component.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
"name": "runtimecomponent-sample"
},
"spec": {
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:494f54bd1476465a4226cb62f0d97cd59cd85b55ff955073e176bda4bd2afbd3",
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:29220c85330a584ab1a22de6771d8b10a36796dd666f2b5b8c4dd92a8f8e76e0",
"expose": true,
"manageTLS": true,
"replicas": 1,
Expand Down Expand Up @@ -44,7 +44,7 @@ metadata:
"name": "runtimecomponent-sample"
},
"spec": {
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:494f54bd1476465a4226cb62f0d97cd59cd85b55ff955073e176bda4bd2afbd3",
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:29220c85330a584ab1a22de6771d8b10a36796dd666f2b5b8c4dd92a8f8e76e0",
"expose": true,
"replicas": 1,
"service": {
Expand All @@ -71,7 +71,7 @@ metadata:
categories: Application Runtime
certified: "true"
containerImage: icr.io/appcafe/runtime-component-operator:daily
createdAt: "2025-08-14T20:19:15Z"
createdAt: "2025-08-19T15:55:15Z"
description: Deploys any runtime component with dynamic and auto-tuning configuration
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "true"
Expand All @@ -81,7 +81,7 @@ metadata:
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=0.8.0 <1.5.0'
operators.operatorframework.io/builder: operator-sdk-v1.38.0
operators.operatorframework.io/builder: operator-sdk-v1.39.2
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
repository: https://github.com/application-stacks/runtime-component-operator
support: Community
Expand Down Expand Up @@ -1058,7 +1058,7 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:494f54bd1476465a4226cb62f0d97cd59cd85b55ff955073e176bda4bd2afbd3
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:29220c85330a584ab1a22de6771d8b10a36796dd666f2b5b8c4dd92a8f8e76e0
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
value: icr.io/appcafe/runtime-component-operator:daily
image: icr.io/appcafe/runtime-component-operator:daily
Expand Down Expand Up @@ -1148,10 +1148,12 @@ spec:
- patch
- delete
- apiGroups:
- apps
- ""
resources:
- deployments
- statefulsets
- configmaps
- secrets
- serviceaccounts
- services
verbs:
- create
- delete
Expand All @@ -1160,28 +1162,23 @@ spec:
- update
- watch
- apiGroups:
- apps
resources:
- deployments/finalizers
- statefulsets
verbs:
- update
- apiGroups:
- autoscaling
- ""
resources:
- horizontalpodautoscalers
- pods
- pods/exec
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- cert-manager.io
- apps
resources:
- certificates
- issuers
- deployments
- statefulsets
verbs:
- create
- delete
Expand All @@ -1190,12 +1187,15 @@ spec:
- update
- watch
- apiGroups:
- ""
- apps
resources:
- configmaps
- secrets
- serviceaccounts
- services
- deployments/finalizers
verbs:
- update
- apiGroups:
- autoscaling
resources:
- horizontalpodautoscalers
verbs:
- create
- delete
Expand All @@ -1204,16 +1204,15 @@ spec:
- update
- watch
- apiGroups:
- ""
- cert-manager.io
resources:
- pods
- pods/exec
- certificates
- issuers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
Expand Down Expand Up @@ -1254,17 +1253,6 @@ spec:
- runtimecomponents
- runtimecomponents/finalizers
- runtimecomponents/status
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- rc.app.stacks
resources:
- runtimeoperations
- runtimeoperations/finalizers
- runtimeoperations/status
Expand Down Expand Up @@ -1345,7 +1333,7 @@ spec:
provider:
name: Community
relatedImages:
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:494f54bd1476465a4226cb62f0d97cd59cd85b55ff955073e176bda4bd2afbd3
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:29220c85330a584ab1a22de6771d8b10a36796dd666f2b5b8c4dd92a8f8e76e0
name: liberty-sample-app
- image: icr.io/appcafe/runtime-component-operator:daily
name: runtime-component-operator
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: runtime-component
operators.operatorframework.io.bundle.channels.v1: v1.5
operators.operatorframework.io.bundle.channel.default.v1: v1.5
operators.operatorframework.io.metrics.builder: operator-sdk-v1.38.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.39.2
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

Expand Down
6 changes: 3 additions & 3 deletions catalog.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.redhat.io/openshift4/ose-operator-registry:v4.14 AS builder
FROM registry.redhat.io/ubi8/ubi-minimal
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18 AS builder
FROM registry.redhat.io/ubi9/ubi-minimal

# Add label for location of Declarative Config root directory & required OpenShift labels
ARG VERSION_LABEL=1.5.0
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY LICENSE /licenses
USER root

# Pick up any latest fixes
RUN microdnf update && microdnf clean all
RUN microdnf update -y && microdnf clean all

# Copy required tooling, licenses, and declarative config into defined location
COPY --from=builder --chown=1001:0 /bin/opm /bin/opm
Expand Down
Loading