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.99.x-prod][SRVLOGIC-245] - Add missing labels for internal OSL bundle validation #25

Merged
merged 6 commits into from
Mar 5, 2024
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
5 changes: 3 additions & 2 deletions Makefile.osl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +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.32.0
IMAGE_DIGEST ?= sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa

# 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 = "candidate,fast,stable")
Expand Down Expand Up @@ -44,11 +45,11 @@ BUILDER ?= podman
# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
# You can enable this value if you would like to use SHA Based Digests
# To enable set flag to true
USE_IMAGE_DIGESTS ?= false
USE_IMAGE_DIGESTS ?= true
IMG_TAG_SEP = :
IMG_VERSION = $(VERSION)
ifeq ($(USE_IMAGE_DIGESTS), true)
BUNDLE_GEN_FLAGS += --use-image-digests
#BUNDLE_GEN_FLAGS += --use-image-digests
IMG_TAG_SEP = @
IMG_VERSION = $(IMAGE_DIGEST)
endif
Expand Down
38 changes: 38 additions & 0 deletions api/go.sum

Large diffs are not rendered by default.

73 changes: 73 additions & 0 deletions bddframework/go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/

# Copy files to locations specified by labels.
COPY bundle/manifests /manifests/
COPY bundle/metadata /metadata/
COPY bundle/tests/scorecard /tests/scorecard/
COPY bundle.osl/manifests /manifests/
COPY bundle.osl/metadata /metadata/
COPY bundle.osl/tests/scorecard /tests/scorecard/
1,275 changes: 653 additions & 622 deletions bundle.osl/manifests/logic-operator-rhel8.clusterserviceversion.yaml

Large diffs are not rendered by default.

120 changes: 120 additions & 0 deletions bundle.osl/manifests/sonataflow.org_sonataflowclusterplatforms.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: sonataflowclusterplatforms.sonataflow.org
spec:
group: sonataflow.org
names:
kind: SonataFlowClusterPlatform
listKind: SonataFlowClusterPlatformList
plural: sonataflowclusterplatforms
singular: sonataflowclusterplatform
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.platformRef.name
name: Platform_Name
type: string
- jsonPath: .spec.platformRef.namespace
name: Platform_NS
type: string
- jsonPath: .status.conditions[?(@.type=='Succeed')].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=='Succeed')].reason
name: Reason
type: string
name: v1alpha08
schema:
openAPIV3Schema:
description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: SonataFlowClusterPlatformSpec defines the desired state of
SonataFlowClusterPlatform
properties:
platformRef:
description: SonataFlowPlatformRef defines which existing SonataFlowPlatform's
supporting services should be used cluster-wide.
properties:
name:
description: Name of the SonataFlowPlatform
type: string
namespace:
description: Namespace of the SonataFlowPlatform
type: string
required:
- name
- namespace
type: object
required:
- platformRef
type: object
status:
description: SonataFlowClusterPlatformStatus defines the observed state
of SonataFlowClusterPlatform
properties:
conditions:
description: The latest available observations of a resource's current
state.
items:
description: Condition describes the common structure for conditions
in our types
properties:
lastUpdateTime:
description: The last time this condition was updated.
format: date-time
type: string
message:
description: A human-readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type condition for the given object
type: string
required:
- status
- type
type: object
type: array
observedGeneration:
description: The generation observed by the deployment controller.
format: int64
type: integer
version:
description: Version the operator version controlling this ClusterPlatform
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
3 changes: 3 additions & 0 deletions bundle.osl/manifests/sonataflow.org_sonataflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9360,6 +9360,9 @@ spec:
description: CACerts is the Certification Authority (CA) certificates
in PEM format according to https://www.rfc-editor.org/rfc/rfc7468.
type: string
audience:
description: Audience is the OIDC audience for this address.
type: string
name:
description: Name is the name of the address.
type: string
Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/sonataflow.org_sonataflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9361,6 +9361,9 @@ spec:
description: CACerts is the Certification Authority (CA) certificates
in PEM format according to https://www.rfc-editor.org/rfc/rfc7468.
type: string
audience:
description: Audience is the OIDC audience for this address.
type: string
name:
description: Name is the name of the address.
type: string
Expand Down
2 changes: 1 addition & 1 deletion config/manager/osl/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ configMapGenerator:
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- digest: sha256:24c2e62bff1f2f7e5579b990e44206ac019bd00f5ca546b069471fc1af34ed75
- digest: sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
name: controller
newName: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator
# Patching the manager deployment file to add an env var with the operator namespace in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,23 @@ metadata:
alm-examples: '[]'
capabilities: Basic Install
categories: Application Runtime
description: OpenShift Serverless Logic Kubernetes Operator for deploying workflow
applications based on the CNCF Serverless Workflow specification
certified: "false"
description: OpenShift Serverless Logic Operator for deploying workflow applications
based on the CNCF Serverless Workflow specification
features.operators.openshift.io/disconnected: "false"
features.operators.openshift.io/fips-compliant: "false"
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"
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/internal-objects: '["sonataflowbuilds.sonataflow.org"]'
repository: https://github.com/apache/incubator-kie-kogito-serverless-operator
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/kiegroup/kogito-serverless-operator/
support: Red Hat
name: logic-operator-rhel8.v0.0.0
namespace: placeholder
Expand Down Expand Up @@ -191,11 +202,14 @@ spec:
version: v1alpha08
description: |-
OpenShift Serverless Logic Kubernetes Operator for deploying workflow applications
based on the [CNCF Serverless Workflow specification](https://serverlessworkflow.io/):
based on the [CNCF Serverless Workflow specification](https://serverlessworkflow.io/) to deploy workflow applications
[suited for the your development cycle](https://openshift-knative.github.io/docs/docs/latest/serverless-logic/cloud/operator/developing-workflows.html).

* Deploy workflow applications using the [dev profile](https://sonataflow.org/serverlessworkflow/latest/cloud/operator/developing-workflows.html), suited for the your development cycle
* Build workflow applications based on the platform you're currently working on.
displayName: SonataFlow Operator
Please follow our [documentation for more information about the OpenShift Serverless Logic Operator Tech Preview](https://openshift-knative.github.io/docs/docs/latest/serverless-logic/about.html).
displayName: OpenShift Serverless Logic Operator
icon:
- base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzOCIgaGVpZ2h0PSIzOCIgdmlld0JveD0iMCAwIDM4IDM4Ij48ZGVmcz48c3R5bGU+LmF7ZmlsbDojZmZmO30uYntmaWxsOiNlMDA7fTwvc3R5bGU+PC9kZWZzPjxwYXRoIGNsYXNzPSJhIiBkPSJNMjgsMUgxMGE5LDksMCwwLDAtOSw5VjI4YTksOSwwLDAsMCw5LDlIMjhhOSw5LDAsMCwwLDktOVYxMGE5LDksMCwwLDAtOS05WiIvPjxwYXRoIGQ9Ik0yOCwyLjI1QTcuNzU4Nyw3Ljc1ODcsMCwwLDEsMzUuNzUsMTBWMjhBNy43NTg3LDcuNzU4NywwLDAsMSwyOCwzNS43NUgxMEE3Ljc1ODcsNy43NTg3LDAsMCwxLDIuMjUsMjhWMTBBNy43NTg3LDcuNzU4NywwLDAsMSwxMCwyLjI1SDI4TTI4LDFIMTBhOSw5LDAsMCwwLTksOVYyOGE5LDksMCwwLDAsOSw5SDI4YTksOSwwLDAsMCw5LTlWMTBhOSw5LDAsMCwwLTktOVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTE0LDIzLjQ3NjZIMTBhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNCwyMy40NzY2Wm0tMy4zNzUtMS4yNWgyLjc1di0yLjc1aC0yLjc1WiIvPjxwYXRoIGNsYXNzPSJiIiBkPSJNMjEsMjMuNDc2NkgxN2EuNjI1My42MjUzLDAsMCwxLS42MjUtLjYyNXYtNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUtLjYyNWg0YS42MjUyLjYyNTIsMCwwLDEsLjYyNS42MjV2NEEuNjI1My42MjUzLDAsMCwxLDIxLDIzLjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0xNy41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNy41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yNC41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwyNC41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yOCwyMy40NzY2SDI0YS42MjUzLjYyNTMsMCwwLDEtLjYyNS0uNjI1di00YS42MjUyLjYyNTIsMCwwLDEsLjYyNS0uNjI1aDRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LjYyNXY0QS42MjUzLjYyNTMsMCwwLDEsMjgsMjMuNDc2NlptLTMuMzc1LTEuMjVoMi43NXYtMi43NWgtMi43NVoiLz48cGF0aCBkPSJNMjksMjYuNDc2Nkg5YS42MjUuNjI1LDAsMCwxLDAtMS4yNUgyOWEuNjI1LjYyNSwwLDAsMSwwLDEuMjVaIi8+PC9zdmc+
mediatype: image/svg+xml
install:
spec:
deployments: null
Expand All @@ -214,9 +228,12 @@ spec:
- cncf
- serverless
- serverlessworkflow
- workflows
links:
- name: Product Page
url: https://sonataflow.org/serverlessworkflow/latest/index.html
- name: Documentation
url: https://openshift-knative.github.io/docs/docs/latest/serverless-logic/about.html
- name: Source Repository
url: https://github.com/kiegroup/kogito-serverless-operator/
maintainers:
- email: [email protected]
name: Red Hat
Expand Down
Loading
Loading