Skip to content

Commit

Permalink
Merge branch 'main' into detail-error-mssg
Browse files Browse the repository at this point in the history
  • Loading branch information
@adarsh0728
adarsh0728 authored Jan 15, 2025
2 parents 1a314f5 + 33b992b commit 1ab5b21
Show file tree
Hide file tree
Showing 61 changed files with 3,777 additions and 1,068 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/nightly-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Make checksums
run: make checksums
- name: store artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: binaries
path: dist
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Rename binary
run: cp -pv target/x86_64-unknown-linux-gnu/release/numaflow numaflow-rs-linux-amd64
- name: Upload numaflow binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: numaflow-rs-linux-amd64
path: rust/numaflow-rs-linux-amd64
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Rename binary
run: cp -pv target/aarch64-unknown-linux-gnu/release/numaflow numaflow-rs-linux-arm64
- name: Upload numaflow binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: numaflow-rs-linux-arm64
path: rust/numaflow-rs-linux-arm64
Expand Down Expand Up @@ -127,19 +127,19 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Download Go binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: binaries
path: dist/

- name: Download Rust amd64 binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: numaflow-rs-linux-amd64
path: dist/

- name: Download Rust arm64 binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: numaflow-rs-linux-arm64
path: dist/
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Make checksums
run: make checksums
- name: store artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: binaries
path: dist
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Rename binary
run: cp -pv target/x86_64-unknown-linux-gnu/release/numaflow numaflow-rs-linux-amd64
- name: Upload numaflow binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: numaflow-rs-linux-amd64
path: rust/numaflow-rs-linux-amd64
Expand All @@ -82,7 +82,7 @@ jobs:
- name: Rename binary
run: cp -pv target/aarch64-unknown-linux-gnu/release/numaflow numaflow-rs-linux-arm64
- name: Upload numaflow binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: numaflow-rs-linux-arm64
path: rust/numaflow-rs-linux-arm64
Expand Down Expand Up @@ -111,19 +111,19 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Download Go binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: binaries
path: dist/

- name: Download Rust amd64 binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: numaflow-rs-linux-amd64
path: dist/

- name: Download Rust arm64 binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: numaflow-rs-linux-arm64
path: dist/
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
- run: bom generate --image quay.io/numaproj/numaflow:$VERSION -o /tmp/numaflow.spdx
# pack the boms into one file to make it easy to download
- run: cd /tmp && tar -zcf sbom.tar.gz *.spdx
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: sbom.tar.gz
path: /tmp/sbom.tar.gz
Expand All @@ -191,11 +191,11 @@ jobs:
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
fi
- name: Download binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: binaries
path: dist/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: sbom.tar.gz
path: /tmp
Expand Down
26 changes: 26 additions & 0 deletions api/json-schema/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21790,6 +21790,10 @@
"description": "SASL mechanism to use",
"type": "string"
},
"oauth": {
"$ref": "#/definitions/io.numaproj.numaflow.v1alpha1.SASLOAuth",
"description": "OAuth contains the oauth config"
},
"plain": {
"$ref": "#/definitions/io.numaproj.numaflow.v1alpha1.SASLPlain",
"description": "SASLPlain contains the sasl plain config"
Expand All @@ -21808,6 +21812,28 @@
],
"type": "object"
},
"io.numaproj.numaflow.v1alpha1.SASLOAuth": {
"properties": {
"clientID": {
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
"description": "ClientID refers to the secret that contains the client id"
},
"clientSecret": {
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
"description": "ClientSecret refers to the secret that contains the client secret"
},
"tokenEndpoint": {
"description": "TokenEndpoint refers to the token endpoint",
"type": "string"
}
},
"required": [
"clientID",
"clientSecret",
"tokenEndpoint"
],
"type": "object"
},
"io.numaproj.numaflow.v1alpha1.SASLPlain": {
"properties": {
"handshake": {
Expand Down
26 changes: 26 additions & 0 deletions api/openapi-spec/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21780,6 +21780,10 @@
"description": "SASL mechanism to use",
"type": "string"
},
"oauth": {
"description": "OAuth contains the oauth config",
"$ref": "#/definitions/io.numaproj.numaflow.v1alpha1.SASLOAuth"
},
"plain": {
"description": "SASLPlain contains the sasl plain config",
"$ref": "#/definitions/io.numaproj.numaflow.v1alpha1.SASLPlain"
Expand All @@ -21794,6 +21798,28 @@
}
}
},
"io.numaproj.numaflow.v1alpha1.SASLOAuth": {
"type": "object",
"required": [
"clientID",
"clientSecret",
"tokenEndpoint"
],
"properties": {
"clientID": {
"description": "ClientID refers to the secret that contains the client id",
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector"
},
"clientSecret": {
"description": "ClientSecret refers to the secret that contains the client secret",
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector"
},
"tokenEndpoint": {
"description": "TokenEndpoint refers to the token endpoint",
"type": "string"
}
}
},
"io.numaproj.numaflow.v1alpha1.SASLPlain": {
"type": "object",
"required": [
Expand Down
105 changes: 105 additions & 0 deletions config/base/crds/full/numaflow.numaproj.io_monovertices.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3474,6 +3474,41 @@ spec:
type: object
mechanism:
type: string
oauth:
properties:
clientID:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
clientSecret:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tokenEndpoint:
type: string
required:
- clientID
- clientSecret
- tokenEndpoint
type: object
plain:
properties:
handshake:
Expand Down Expand Up @@ -4009,6 +4044,41 @@ spec:
type: object
mechanism:
type: string
oauth:
properties:
clientID:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
clientSecret:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tokenEndpoint:
type: string
required:
- clientID
- clientSecret
- tokenEndpoint
type: object
plain:
properties:
handshake:
Expand Down Expand Up @@ -4723,6 +4793,41 @@ spec:
type: object
mechanism:
type: string
oauth:
properties:
clientID:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
clientSecret:
properties:
key:
type: string
name:
default: ""
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tokenEndpoint:
type: string
required:
- clientID
- clientSecret
- tokenEndpoint
type: object
plain:
properties:
handshake:
Expand Down
Loading

0 comments on commit 1ab5b21

Please sign in to comment.