forked from fybrik/fybrik
-
Notifications
You must be signed in to change notification settings - Fork 2
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
Update plotters #7
Open
revit13
wants to merge
6
commits into
froesef:new_blueprints_v2
Choose a base branch
from
revit13:update_plotters
base: new_blueprints_v2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a7d43d7
Update scenario2 plotter
revit13 6a770ab
Update plotters in scenarios 2,3,4 and 6
revit13 5cb5ab2
Update status
revit13 3edee3a
Update plotter in scenario 7
revit13 5d1a1a8
Fix plotter in scenario 7
revit13 3e7d1a3
Add trigger timer
revit13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
285 changes: 144 additions & 141 deletions
285
manager/testdata/new-blueprints/scenario2/plotter.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,182 +1,185 @@ | ||
apiVersion: app.m4d.ibm.com/v1alpha2 | ||
apiVersion: app.fybrik.io/v1alpha1 | ||
kind: Plotter | ||
metadata: | ||
name: app1-ns1 # plotter name is a combination of app and namespace | ||
namespace: m4d-system | ||
namespace: fybrik-system | ||
labels: | ||
spec: | ||
appSelector: # Selector of the application that uses this workload | ||
clusterName: thegreendragon | ||
appSelector: | ||
clusterName: "" | ||
workloadSelector: | ||
matchLabels: | ||
app: demoapp | ||
app: ws-notebook | ||
assets: | ||
- assetId: "m4d-notebook-sample/paysim" | ||
cluster: thegreendragon | ||
credentials: | ||
read: | ||
fybrik-notebook-sample/paysim-csv: | ||
assetDetails: | ||
connection: | ||
name: paysim-csv | ||
s3: | ||
bucket: notebook-sample | ||
endpoint: s3.eu-gb.cloud-object-storage.appdomain.cloud | ||
object_key: data.csv | ||
type: 2 | ||
format: csv | ||
vault: | ||
address: http://vault.m4d-system:8200 | ||
authPath: /v1/auth/kubernetes/login | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/paysim?namespace=m4d-notebook-sample | ||
connection: | ||
s3: | ||
endpoint: localhost:8001 | ||
bucket: srcbucket | ||
object: data.parq | ||
dataformat: parquet | ||
- assetId: "m4d-notebook-sample/users" | ||
cluster: thegreendragon | ||
credentials: | ||
read: | ||
read: | ||
address: http://vault.fybrik-system:8200 | ||
authPath: "" | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/paysim-csv?namespace=fybrik-notebook-sample | ||
fybrik-notebook-sample/users: | ||
assetDetails: | ||
connection: | ||
name: users | ||
s3: | ||
bucket: notebook-sample | ||
endpoint: s3.eu-gb.cloud-object-storage.appdomain.cloud | ||
object_key: users.csv | ||
type: 2 | ||
format: csv | ||
vault: | ||
address: http://vault.m4d-system:8200 | ||
authPath: /v1/auth/kubernetes/login | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/users?namespace=m4d-notebook-sample | ||
connection: | ||
s3: | ||
endpoint: localhost:8001 | ||
bucket: srcbucket | ||
object: users.parq | ||
dataformat: parquet | ||
- assetId: "m4d-notebook-sample/inventory" | ||
cluster: thegreendragon | ||
credentials: | ||
read: | ||
read: | ||
address: http://vault.fybrik-system:8200 | ||
authPath: "" | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/paysim-csv?namespace=fybrik-notebook-sample | ||
fybrik-notebook-sample/inventory: | ||
assetDetails: | ||
connection: | ||
name: inventory | ||
s3: | ||
bucket: notebook-sample | ||
endpoint: s3.eu-gb.cloud-object-storage.appdomain.cloud | ||
object_key: inventory.csv | ||
type: 2 | ||
format: csv | ||
vault: | ||
address: http://vault.m4d-system:8200 | ||
authPath: /v1/auth/kubernetes/login | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/inventory?namespace=m4d-notebook-sample | ||
connection: | ||
s3: | ||
endpoint: localhost:8001 | ||
bucket: srcbucket | ||
object: inventory.parq | ||
dataformat: parquet | ||
read: | ||
address: http://vault.fybrik-system:8200 | ||
authPath: "" | ||
role: module | ||
secretPath: /v1/kubernetes-secrets/paysim-csv?namespace=fybrik-notebook-sample | ||
flows: | ||
- name: flow-paysim | ||
flowType: read | ||
assetId: "m4d-notebook-sample/paysim" | ||
subflows: | ||
- name: subflow-paysim | ||
flowType: read | ||
triggers: | ||
- workload | ||
assetId: "m4d-notebook-sample/paysim-csv" | ||
subFlows: | ||
- flowType: read | ||
name: "" | ||
steps: | ||
- - name: step1 | ||
cluster: thegreendragon | ||
- - cluster: thegreendragon | ||
name: "" | ||
template: read-and-transform | ||
parameters: | ||
source: | ||
assetId: "m4d-notebook-sample/paysim" | ||
api: | ||
service: | ||
assetID: m4d-notebook-sample/paysim | ||
interfaceDetails: | ||
protocol: arrow-flight | ||
dataformat: arrow | ||
actions: | ||
- action: redact | ||
column: field1 | ||
endpoint: | ||
hostname: notebook-fybrik-notebook-sample-ar-c2308.fybrik-blueprints | ||
port: 80 | ||
scheme: grpc | ||
format: arrow | ||
source: | ||
assetId: fybrik-notebook-sample/paysim-csv | ||
action: | ||
- name: RedactAction | ||
description: "redacting columns: [nameOrig]" | ||
columns: | ||
- nameOrig | ||
options: | ||
redactValue: "XXXXX" | ||
triggers: | ||
- workload | ||
- name: flow-users | ||
flowType: read | ||
assetId: "m4d-notebook-sample/users" | ||
subflows: | ||
subFlows: | ||
- name: subflow-users | ||
flowType: read | ||
triggers: | ||
- workload | ||
steps: | ||
- - name: step1 | ||
- - name: "" | ||
cluster: thegreendragon | ||
template: read-and-transform | ||
parameters: | ||
source: | ||
assetId: "m4d-notebook-sample/users" | ||
api: | ||
service: | ||
assetID: m4d-notebook-sample/users | ||
interfaceDetails: | ||
protocol: arrow-flight | ||
dataformat: arrow | ||
actions: | ||
- action: redact | ||
column: blood_group | ||
endpoint: | ||
hostname: notebook-fybrik-notebook-sample-ar-c2308.fybrik-blueprints | ||
port: 80 | ||
scheme: grpc | ||
format: arrow | ||
source: | ||
assetId: fybrik-notebook-sample/users | ||
action: | ||
- name: RedactAction | ||
description: "redacting columns: [nameOrig]" | ||
columns: | ||
- bloodGroup | ||
options: | ||
redactValue: "XXXXX" | ||
triggers: | ||
- workload | ||
- name: flow-inventory | ||
flowType: read | ||
assetId: "m4d-notebook-sample/inventory" | ||
subflows: | ||
subFlows: | ||
- name: subflow-inventory | ||
flowType: read | ||
triggers: | ||
- workload | ||
steps: | ||
- - name: step1 | ||
- - name: "" | ||
cluster: thegreendragon | ||
template: read-and-transform | ||
parameters: | ||
source: | ||
assetId: "m4d-notebook-sample/inventory" | ||
api: | ||
service: | ||
assetID: m4d-notebook-sample/inventory | ||
interfaceDetails: | ||
protocol: arrow-flight | ||
dataformat: arrow | ||
actions: | ||
- action: redact | ||
column: field2 | ||
endpoint: | ||
hostname: notebook-fybrik-notebook-sample-ar-c2308.fybrik-blueprints | ||
port: 80 | ||
scheme: grpc | ||
format: arrow | ||
source: | ||
assetId: fybrik-notebook-sample/inventory | ||
action: | ||
- name: RedactAction | ||
description: "redacting columns: [nameOrig]" | ||
columns: | ||
- nameOrig | ||
options: | ||
redactValue: "XXXXX" | ||
triggers: | ||
- workload | ||
templates: | ||
- name: read-and-transform | ||
modules: | ||
- name: arrow-flight-read | ||
kind: M4DModule | ||
chart: | ||
name: ghcr.io/mesh-for-data/read-module:0.1.0 | ||
- name: transform-conf | ||
kind: M4DModule | ||
chart: | ||
name: ghcr.io/mesh-for-data/m4d-arrow-flight-transform-conf:0.1.0 | ||
read-and-transform: | ||
modules: | ||
- name: read | ||
chart: | ||
name: ghcr.io/fybrik/arrow-flight-module-chart:latest | ||
values: | ||
image.tag: latest | ||
scope: workload | ||
type: service | ||
- name: transform-conf | ||
chart: | ||
name: ghcr.io/mesh-for-data/fybrik-arrow-flight-transform-conf:0.1.0 | ||
type: plugin | ||
status: | ||
observedState: Not Ready | ||
observedGeneration: 1 | ||
# The global modules are generated when the blueprints are generated and injected into them. | ||
# Yet they still have a status that is important to the workflow. | ||
flows: | ||
- name: flow-paysim | ||
status: Ready | ||
subflows: | ||
- name: subflow-paysim | ||
status: Ready | ||
- name: flow-users | ||
status: Ready | ||
subflows: | ||
- name: subflow-users | ||
status: Ready | ||
- name: flow-inventory | ||
status: Ready | ||
subflows: | ||
- name: subflow-inventory | ||
status: Not Ready | ||
assets: | ||
- name: m4d-notebook-sample/paysim | ||
endpoint: app1-ns1.m4d-blueprints | ||
port: 8080 | ||
status: Ready | ||
- name: m4d-notebook-sample/users | ||
endpoint: app1-ns1.m4d-blueprints | ||
port: 8080 | ||
status: Ready | ||
- name: m4d-notebook-sample/inventory | ||
endpoint: app1-ns1.m4d-blueprints | ||
port: 8080 | ||
status: Not Ready | ||
errors: | ||
- "This would be a possible error" | ||
conditions: | ||
- type: Error | ||
status: "False" | ||
message: "This would be a possible error" | ||
fybrik-notebook-sample/paysim-csv: | ||
ready: true | ||
fybrik-notebook-sample/users: | ||
ready: true | ||
fybrik-notebook-sample/inventory: | ||
ready: true | ||
blueprints: | ||
thegreendragon: | ||
name: my-notebook-tmp-33uu3-fybrik-notebook-sample | ||
namespace: fybrik-blueprints | ||
status: | ||
modules: | ||
arrow-flight-module: | ||
ready: true | ||
observedGeneration: 1 | ||
observedState: | ||
ready: true | ||
releases: | ||
notebook-fybrik-notebook-sample-ar-c2308: 1 | ||
observedGeneration: 1 | ||
observedState: | ||
ready: true | ||
readyTimestamp: "2021-10-06T08:58:59Z" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Status modules section does not match the modules inside templates.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks will fix that