Skip to content
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

[9.102.x prod] update prod bundle to OSL 1.35 #100

Merged
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: 4 additions & 4 deletions Makefile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IMG ?= $(IMAGE_TAG_BASE)$(IMG_TAG_SEP)$(IMG_VERSION)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.24

OPERATOR_SDK_VERSION ?= 1.25.0
OPERATOR_SDK_VERSION ?= 1.35.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -98,7 +98,7 @@ help: ## Display this help.

.PHONY: manifests
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) rbac:roleName=manager-role crd:allowDangerousTypes=true webhook paths="./api/..." paths="./controllers/..." output:crd:artifacts:config=config/crd/bases
$(CONTROLLER_GEN) rbac:roleName=manager-role crd:allowDangerousTypes=true webhook paths="./api/..." paths="./internal/controller/..." output:crd:artifacts:config=config/crd/bases

.PHONY: generate
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
Expand Down Expand Up @@ -224,7 +224,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v5.5.0
CONTROLLER_TOOLS_VERSION ?= v0.9.2
CONTROLLER_TOOLS_VERSION ?= v0.16.4

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down Expand Up @@ -309,7 +309,7 @@ bump-version:
./hack/bump-version.sh $(new_version) $(snapshot)

install-operator-sdk:
./hack/ci/install-operator-sdk.sh
./hack/install-operator-sdk.sh

.PHONY: addheaders
addheaders:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
data:
DEFAULT_WORKFLOW_EXTENSION: .sw.json
Dockerfile: "FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:latest
Dockerfile: "FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.35.0
AS builder\n\n# variables that can be overridden by the builder\n# To add a Quarkus
extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus
CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional java/mvn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
apiVersion: v1
data:
controllers_cfg.yaml: |
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

# The default size of Kaniko PVC when using the internal operator builder manager
defaultPvcKanikoSize: 1Gi
# How much time (in seconds) to wait for a devmode workflow to start.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
apiVersion: v1
data:
controller_manager_config.yaml: |
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig
health:
Expand Down
117 changes: 44 additions & 73 deletions bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ metadata:
capabilities: Basic Install
categories: Application Runtime
certified: "false"
createdAt: "2024-11-15T16:05:39Z"
description: OpenShift Serverless Logic Kubernetes Operator for deploying workflow
applications based on the CNCF Serverless Workflow specification
features.operators.openshift.io/disconnected: "false"
Expand All @@ -132,9 +133,9 @@ metadata:
operatorframework.io/suggested-namespace: openshift-serverless-logic
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-v1.25.0
operators.operatorframework.io/builder: operator-sdk-v1.35.0
operators.operatorframework.io/internal-objects: '["sonataflowbuilds.sonataflow.org"]'
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
repository: https://github.com/kiegroup/kogito-serverless-operator/
support: Red Hat
name: logic-operator-rhel8.v1.35.0
Expand All @@ -145,7 +146,7 @@ spec:
owned:
- description: SonataFlowBuild is an internal custom resource to control workflow
build instances in the target platform
displayName: Sonata Flow Build
displayName: SonataFlowBuild
kind: SonataFlowBuild
name: sonataflowbuilds.sonataflow.org
resources:
Expand Down Expand Up @@ -192,7 +193,7 @@ spec:
version: v1alpha08
- description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms
API
displayName: Sonata Flow Cluster Platform
displayName: SonataFlowClusterPlatform
kind: SonataFlowClusterPlatform
name: sonataflowclusterplatforms.sonataflow.org
resources:
Expand Down Expand Up @@ -221,7 +222,7 @@ spec:
version: v1alpha08
- description: SonataFlowPlatform is the descriptor for the workflow platform
infrastructure.
displayName: Sonata Flow Platform
displayName: SonataFlowPlatform
kind: SonataFlowPlatform
name: sonataflowplatforms.sonataflow.org
resources:
Expand Down Expand Up @@ -258,6 +259,11 @@ spec:
no build required)
displayName: DevMode
path: devMode
- description: Broker to communicate with workflow deployment. It can be the
default broker when the workflow, Dataindex, or Jobservice does not have
a sink or source specified.
displayName: broker
path: eventing.broker
- description: 'Services attributes for deploying supporting applications like
Data Index & Job Service. Only workflows without the `sonataflow.org/profile:
dev` annotation will be configured to use these service(s). Setting this
Expand All @@ -282,16 +288,19 @@ spec:
SonataFlowClusterPlatform
displayName: clusterPlatformRef
path: clusterPlatformRef
- description: Info generic information related to the build
- description: Info generic information related to the Platform
displayName: info
path: info
- description: Triggers list of triggers created for the SonataFlowPlatform
displayName: triggers
path: triggers
- description: Version the operator version controlling this Platform
displayName: version
path: version
version: v1alpha08
- description: SonataFlow is the descriptor representation for a workflow application
based on the CNCF Serverless Workflow specification.
displayName: Sonata Flow
displayName: SonataFlow
kind: SonataFlow
name: sonataflows.sonataflow.org
resources:
Expand Down Expand Up @@ -328,6 +337,10 @@ spec:
- description: Sink describes the sinkBinding details of this SonataFlow instance.
displayName: sink
path: sink
- description: Sources describes the list of sources used to create triggers
for events consumed by this SonataFlow instance.
displayName: sources
path: sources
statusDescriptors:
- description: Address is used as a part of Addressable interface (status.address.url)
for knative
Expand All @@ -336,8 +349,13 @@ spec:
- description: Endpoint is an externally accessible URL of the workflow
displayName: endpoint
path: endpoint
- displayName: flowRevision
path: flowCRC
- displayName: lastTimeRecoverAttempt
path: lastTimeRecoverAttempt
- description: Platform displays which platform is being used by this workflow
displayName: platform
path: platform
- description: keeps track of how many failure recovers a given workflow had
so far
displayName: recoverFailureAttempts
Expand All @@ -346,6 +364,9 @@ spec:
workflow
displayName: services
path: services
- description: Triggers list of triggers created for the SonataFlow
displayName: triggers
path: triggers
version: v1alpha08
description: |-
OpenShift Serverless Logic Kubernetes Operator for deploying workflow applications
Expand Down Expand Up @@ -480,86 +501,30 @@ spec:
- update
- watch
- apiGroups:
- sonataflow.org
- monitoring.coreos.com
resources:
- sonataflowbuilds
- servicemonitors
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- sonataflow.org
resources:
- sonataflowbuilds/finalizers
verbs:
- update
- apiGroups:
- sonataflow.org
- serving.knative.dev
resources:
- sonataflowbuilds/status
- revisions
verbs:
- get
- patch
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflowclusterplatforms
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- sonataflow.org
resources:
- sonataflowclusterplatforms/finalizers
verbs:
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflowclusterplatforms/status
verbs:
- get
- patch
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflowbuilds
- sonataflowclusterplatforms
- sonataflowplatforms
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- sonataflow.org
resources:
- sonataflowplatforms/finalizers
verbs:
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflowplatforms/status
verbs:
- get
- patch
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflows
verbs:
- create
Expand All @@ -572,12 +537,18 @@ spec:
- apiGroups:
- sonataflow.org
resources:
- sonataflowbuilds/finalizers
- sonataflowclusterplatforms/finalizers
- sonataflowplatforms/finalizers
- sonataflows/finalizers
verbs:
- update
- apiGroups:
- sonataflow.org
resources:
- sonataflowbuilds/status
- sonataflowclusterplatforms/status
- sonataflowplatforms/status
- sonataflows/status
verbs:
- get
Expand Down Expand Up @@ -767,7 +738,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:123456789
image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:8d16a903b5b5307f3636a82bce59efaebac3789d63558c8e0bca860a88e89b60
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -784,10 +755,10 @@ spec:
resources:
limits:
cpu: 500m
memory: 128Mi
memory: 500Mi
requests:
cpu: 10m
memory: 64Mi
cpu: 100m
memory: 200Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
Loading
Loading