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.

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

Sync main branch with Apache main branch #27

Merged
merged 5 commits into from
Mar 27, 2024
Merged

Sync main branch with Apache main branch #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b01c53
Propagate workflow labels to the its K8s resources (#413)
masayag Mar 13, 2024
ce32c1a
ISSUE-430: Upgrade protobuf from 1.31.0 to 1.33.0 (#431)
ricardozanini Mar 15, 2024
78828cd
add services to SonataFlow status (#415)
tchughesiv Mar 18, 2024
0699a93
Bump github.com/docker/docker in /container-builder (#433)
dependabot[bot] Mar 22, 2024
ca5744d
Fix Issue #319 - Rename prod profile to preview (#414)
ricardozanini Mar 22, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@
/.idea/
/.vscode/
/target/

e2e-test-report.xml
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ require (
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
24 changes: 23 additions & 1 deletion api/metadata/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,35 @@ const (
SpecVersion = "0.8"
)

type QuarkusProfileType string

func (p QuarkusProfileType) String() string {
return string(p)
}

const (
// QuarkusDevProfile the profile used by quarkus in devmode
QuarkusDevProfile QuarkusProfileType = "dev"
// QuarkusProdProfile the profile used by quarkus in an immutable image
QuarkusProdProfile QuarkusProfileType = "prod"
)

type ProfileType string

func (p ProfileType) String() string {
return string(p)
}

const (
DevProfile ProfileType = "dev"
// DevProfile deploys a mutable workflow that can be changed based on .spec.flow definitions CR change.
DevProfile ProfileType = "dev"
// Deprecated: use PreviewProfile.
ProdProfile ProfileType = "prod"
// PreviewProfile is the default profile if none is set.
// The operator will use the platform to do a minimal image build for users to preview an immutable app deployed in the cluster.
// Not suitable for production use cases since the managed build has configuration and resources limitations.
PreviewProfile ProfileType = "preview"
// GitOpsProfile signs the operator that the application image is built externally, skipping any internal managed build.
// Ideally used in production use cases
GitOpsProfile ProfileType = "gitops"
)
3 changes: 3 additions & 0 deletions api/v1alpha08/sonataflow_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,9 @@ type SonataFlowStatus struct {
// Endpoint is an externally accessible URL of the workflow
//+operator-sdk:csv:customresourcedefinitions:type=status,displayName="endpoint"
Endpoint *apis.URL `json:"endpoint,omitempty"`
// Services displays which platform services are being used by this workflow
//+operator-sdk:csv:customresourcedefinitions:type=status,displayName="services"
Services *PlatformServicesStatus `json:"services,omitempty"`
}

func (s *SonataFlowStatus) GetTopLevelConditionType() api.ConditionType {
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha08/sonataflowplatform_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ type PlatformServicesStatus struct {
// PlatformServiceRefStatus displays information on a cluster-wide service
// +k8s:openapi-gen=true
type PlatformServiceRefStatus struct {
// Url displays the base url of a cluster-wide service
// Url displays the base url of the service
Url string `json:"url,omitempty"`
}

Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha08/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bddframework/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
2 changes: 1 addition & 1 deletion bddframework/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,10 @@ spec:
so far
displayName: recoverFailureAttempts
path: recoverFailureAttempts
- description: Services displays which platform services are being used by this
workflow
displayName: services
path: services
version: v1alpha08
description: |-
SonataFlow Kubernetes Operator for deploying workflow applications
Expand Down
6 changes: 2 additions & 4 deletions bundle/manifests/sonataflow.org_sonataflowplatforms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16270,17 +16270,15 @@ spec:
Data Index service
properties:
url:
description: Url displays the base url of a cluster-wide
service
description: Url displays the base url of the service
type: string
type: object
jobServiceRef:
description: JobServiceRef displays information on the cluster-wide
Job Service
properties:
url:
description: Url displays the base url of a cluster-wide
service
description: Url displays the base url of the service
type: string
type: object
type: object
Expand Down
21 changes: 21 additions & 0 deletions bundle/manifests/sonataflow.org_sonataflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9456,6 +9456,27 @@ spec:
description: keeps track of how many failure recovers a given workflow
had so far
type: integer
services:
description: Services displays which platform services are being used
by this workflow
properties:
dataIndexRef:
description: DataIndexRef displays information on the cluster-wide
Data Index service
properties:
url:
description: Url displays the base url of the service
type: string
type: object
jobServiceRef:
description: JobServiceRef displays information on the cluster-wide
Job Service
properties:
url:
description: Url displays the base url of the service
type: string
type: object
type: object
type: object
type: object
served: true
Expand Down
6 changes: 2 additions & 4 deletions config/crd/bases/sonataflow.org_sonataflowplatforms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16271,17 +16271,15 @@ spec:
Data Index service
properties:
url:
description: Url displays the base url of a cluster-wide
service
description: Url displays the base url of the service
type: string
type: object
jobServiceRef:
description: JobServiceRef displays information on the cluster-wide
Job Service
properties:
url:
description: Url displays the base url of a cluster-wide
service
description: Url displays the base url of the service
type: string
type: object
type: object
Expand Down
21 changes: 21 additions & 0 deletions config/crd/bases/sonataflow.org_sonataflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9457,6 +9457,27 @@ spec:
description: keeps track of how many failure recovers a given workflow
had so far
type: integer
services:
description: Services displays which platform services are being used
by this workflow
properties:
dataIndexRef:
description: DataIndexRef displays information on the cluster-wide
Data Index service
properties:
url:
description: Url displays the base url of the service
type: string
type: object
jobServiceRef:
description: JobServiceRef displays information on the cluster-wide
Job Service
properties:
url:
description: Url displays the base url of the service
type: string
type: object
type: object
type: object
type: object
served: true
Expand Down
4 changes: 4 additions & 0 deletions config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ spec:
so far
displayName: recoverFailureAttempts
path: recoverFailureAttempts
- description: Services displays which platform services are being used by this
workflow
displayName: services
path: services
version: v1alpha08
description: |-
SonataFlow Kubernetes Operator for deploying workflow applications
Expand Down
4 changes: 2 additions & 2 deletions container-builder/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/apache/incubator-kie-kogito-serverless-operator/container-buil
go 1.21

require (
github.com/docker/docker v24.0.7+incompatible
github.com/docker/docker v24.0.9+incompatible
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11
github.com/google/uuid v1.3.1
github.com/hashicorp/go-version v1.6.0
Expand Down Expand Up @@ -76,7 +76,7 @@ require (
golang.org/x/tools v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading