Skip to content

Commit

Permalink
Merge branch 'master' into bug/array-node-backoff-controller
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Rammer <[email protected]>
  • Loading branch information
hamersaw committed Jan 2, 2024
2 parents ebd2c3b + cb37291 commit 096ac74
Show file tree
Hide file tree
Showing 251 changed files with 95,964 additions and 42,246 deletions.
1 change: 1 addition & 0 deletions .github/workflows/flyteidl-buf-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Publish flyteidl Buf Package
on:
push:
branches:
- artifacts-shell
- artifacts
- master
paths:
Expand Down
162 changes: 98 additions & 64 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion charts/flyte-sandbox/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
version: 12.1.9
digest: sha256:e7155e540bbdb98f690eb12e2bd301a19d8b36833336f6991410cb44d8d9bb5e
generated: "2023-03-31T09:25:07.80904-07:00"
generated: "2023-10-28T10:05:34.269916+08:00"
2 changes: 1 addition & 1 deletion charts/flyte-sandbox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ A Helm chart for the Flyte local sandbox
| flyte-binary.configuration.inline.task_resources.limits.gpu | int | `0` | |
| flyte-binary.configuration.inline.task_resources.limits.memory | int | `0` | |
| flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-sandbox.configuration.inlineConfigMap\" . }}"` | |
| flyte-binary.configuration.logging.level | int | `6` | |
| flyte-binary.configuration.logging.level | int | `5` | |
| flyte-binary.configuration.logging.plugins.kubernetes.enabled | bool | `true` | |
| flyte-binary.configuration.logging.plugins.kubernetes.templateUri | string | `"http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }}"` | |
| flyte-binary.configuration.storage.metadataContainer | string | `"my-s3-bucket"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/flyte-sandbox/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ flyte-binary:
accessKey: minio
secretKey: miniostorage
logging:
level: 6
level: 5
plugins:
kubernetes:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion charts/flyteagent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ A Helm chart for Flyte agent
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
| image.repository | string | `"ghcr.io/flyteorg/flyteagent"` | Docker image for flyteagent deployment |
| image.tag | string | `"1.10.1"` | Docker image tag |
| image.tag | string | `"1.10.2"` | Docker image tag |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | nodeSelector for flyteagent deployment |
| podAnnotations | object | `{}` | Annotations for flyteagent pods |
Expand Down
2 changes: 1 addition & 1 deletion charts/flyteagent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ image:
# -- Docker image for flyteagent deployment
repository: ghcr.io/flyteorg/flyteagent
# -- Docker image tag
tag: 1.10.1 # FLYTEAGENT_TAG
tag: 1.10.2 # FLYTEAGENT_TAG
# -- Docker image pull policy
pullPolicy: IfNotPresent
ports:
Expand Down
20 changes: 9 additions & 11 deletions datacatalog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ require (
github.com/gofrs/uuid v4.2.0+incompatible
github.com/golang/glog v1.1.0
github.com/golang/protobuf v1.5.3
github.com/jackc/pgconn v1.10.1
github.com/jackc/pgconn v1.14.1
github.com/mitchellh/mapstructure v1.5.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
go.opentelemetry.io/otel v1.19.0
google.golang.org/grpc v1.56.1
gorm.io/driver/postgres v1.2.3
gorm.io/driver/sqlite v1.5.0
gorm.io/gorm v1.25.1
gorm.io/driver/postgres v1.5.3
gorm.io/driver/sqlite v1.5.4
gorm.io/gorm v1.25.4
gorm.io/plugin/opentelemetry v0.1.4
)

Expand All @@ -46,6 +46,7 @@ require (
github.com/flyteorg/stow v0.3.8 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-gormigrate/gormigrate/v2 v2.1.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
Expand All @@ -65,10 +66,9 @@ require (
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.9.0 // indirect
github.com/jackc/pgx/v4 v4.14.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -79,7 +79,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-sqlite3 v1.14.15 // indirect
github.com/mattn/go-sqlite3 v1.14.17 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand Down Expand Up @@ -145,8 +145,6 @@ replace (
github.com/flyteorg/flyte/flyteplugins => ../flyteplugins
github.com/flyteorg/flyte/flytepropeller => ../flytepropeller
github.com/flyteorg/flyte/flytestdlib => ../flytestdlib
gorm.io/driver/sqlite => gorm.io/driver/sqlite v1.1.1
gorm.io/gorm => gorm.io/gorm v1.22.4
k8s.io/api => k8s.io/api v0.28.2
k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
k8s.io/client-go => k8s.io/client-go v0.28.2
Expand Down
Loading

0 comments on commit 096ac74

Please sign in to comment.