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

Jump to bottom

Disable samples by default #599

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Disable samples by default #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dde1c59
feat: disable sample pipeline by default
HumairAK Mar 9, 2024
6168faa
chore: add tests for sample pipeline loading
HumairAK Mar 9, 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: 1 addition & 1 deletion api/v1alpha1/dspipeline_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ type APIServer struct {
// +kubebuilder:validation:Optional
EnableRoute bool `json:"enableOauth"`
// Include sample pipelines with the deployment of this DSP API Server. Default: true
// +kubebuilder:default:=true
// +kubebuilder:default:=false
// +kubebuilder:validation:Optional
EnableSamplePipeline bool `json:"enableSamplePipeline"`
// Default: true
Expand Down
2 changes: 1 addition & 1 deletion ...ses/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
Default: true'
type: boolean
enableSamplePipeline:
default: true
default: false
description: 'Include sample pipelines with the deployment of
this DSP API Server. Default: true'
type: boolean
Expand Down
7 changes: 7 additions & 0 deletions config/internal/apiserver/default/deployment.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ spec:
image: {{.APIServer.Image}}
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
{{ if .APIServer.EnableSamplePipeline }}
- --sampleconfig=/config/sample_config.json
{{ end }}
ports:
- containerPort: 8888
name: http
Expand Down
1 change: 1 addition & 0 deletions controllers/testdata/declarative/case_0/deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: testdsp0
spec:
apiServer:
enableSamplePipeline: true
argoLauncherImage: argolauncherimage:test0
argoDriverImage: argodriverimage:test0
objectStorage:
Expand Down
5 changes: 5 additions & 0 deletions controllers/testdata/declarative/case_0/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ spec:
image: api-server:test0
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
- --sampleconfig=/config/sample_config.json
ports:
- containerPort: 8888
name: http
Expand Down
5 changes: 5 additions & 0 deletions controllers/testdata/declarative/case_2/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ spec:
image: api-server:test2
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
- --sampleconfig=/config/sample_config.json
ports:
- containerPort: 8888
name: http
Expand Down
4 changes: 4 additions & 0 deletions controllers/testdata/declarative/case_3/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ spec:
image: api-server:test3
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
ports:
- containerPort: 8888
name: http
Expand Down
4 changes: 4 additions & 0 deletions controllers/testdata/declarative/case_4/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ spec:
image: this-apiserver-image-from-cr-should-be-used:test4
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
ports:
- containerPort: 8888
name: http
Expand Down
22 changes: 4 additions & 18 deletions controllers/testdata/declarative/case_5/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ spec:
image: api-server:test5
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
ports:
- containerPort: 8888
name: http
Expand Down Expand Up @@ -155,15 +159,6 @@ spec:
limits:
cpu: 500m
memory: 1Gi
volumeMounts:
- name: server-config
mountPath: /config/config.json
subPath: config.json
- mountPath: /config/sample_config.json
name: sample-config
subPath: sample_config.json
- mountPath: /samples/
name: sample-pipeline
- name: oauth-proxy
args:
- --https-address=:8443
Expand Down Expand Up @@ -220,13 +215,4 @@ spec:
defaultMode: 420
name: pipeline-server-config-testdsp5
name: server-config
- configMap:
defaultMode: 420
name: sample-config-testdsp5
name: sample-config
- configMap:
defaultMode: 420
name: sample-pipeline-testdsp5
name: sample-pipeline

serviceAccountName: ds-pipeline-testdsp5
4 changes: 4 additions & 0 deletions controllers/testdata/declarative/case_6/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ spec:
image: api-server:test6
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
ports:
- containerPort: 8888
name: http
Expand Down
5 changes: 5 additions & 0 deletions controllers/testdata/declarative/case_7/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ spec:
image: api-server:test7
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
- --sampleconfig=/config/sample_config.json
ports:
- containerPort: 8888
name: http
Expand Down
4 changes: 4 additions & 0 deletions controllers/testdata/declarative/case_8/expected/created/apiserver_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ spec:
image: api-server:test8
imagePullPolicy: Always
name: ds-pipeline-api-server
command: ['/bin/apiserver']
args:
- --config=/config
- -logtostderr=true
ports:
- containerPort: 8888
name: http
Expand Down
Loading