Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move cliImage to a new field within providers to allow Image to be us…
Browse files Browse the repository at this point in the history
…ed by the upcoming provider deployment
TobyPinfold committed Dec 13, 2024
1 parent 3de9eb7 commit bea1c4b
Showing 8 changed files with 12 additions and 16 deletions.
6 changes: 1 addition & 5 deletions apis/pipelines/v1alpha6/provider_types.go
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ import (
type ProviderSpec struct {
Type ProviderType `json:"type" yaml:"type"`
Image string `json:"image" yaml:"image"`
CliImage string `json:"cliImage" yaml:"cliImage"`
ExecutionMode string `json:"executionMode" yaml:"executionMode"`
// +kubebuilder:validation:Pattern:=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`
ServiceAccount string `json:"serviceAccount" yaml:"serviceAccount"`
@@ -23,11 +24,6 @@ type ProviderSpec struct {

type ProviderType string

const (
KFP ProviderType = "KFP"
VAI ProviderType = "VAI"
)

func (ps Provider) ComputeHash() []byte {
oh := pipelines.NewObjectHasher()
oh.WriteStringField(ps.Spec.Image)
2 changes: 1 addition & 1 deletion config/manager/workflows/common.yaml
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{workflow.parameters.provider-config}}'
- - name: select-provider-sa
4 changes: 2 additions & 2 deletions config/manager/workflows/compiled.yaml
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{workflow.parameters.provider-config}}'
- - name: select-provider-sa
@@ -244,7 +244,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{workflow.parameters.provider-config}}'
- - name: select-provider-sa
4 changes: 2 additions & 2 deletions config/manager/workflows/simple.yaml
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{workflow.parameters.provider-config}}'
- - name: select-provider-sa
@@ -173,7 +173,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{workflow.parameters.provider-config}}'
- - name: select-provider-sa
2 changes: 1 addition & 1 deletion helm/kfp-operator/templates/workflows/common.yaml
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{`{{workflow.parameters.provider-config}}`}}'
- - name: select-provider-sa
4 changes: 2 additions & 2 deletions helm/kfp-operator/templates/workflows/compiled.yaml
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{`{{workflow.parameters.provider-config}}`}}'
- - name: select-provider-sa
@@ -251,7 +251,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{`{{workflow.parameters.provider-config}}`}}'
- - name: select-provider-sa
4 changes: 2 additions & 2 deletions helm/kfp-operator/templates/workflows/simple.yaml
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{`{{workflow.parameters.provider-config}}`}}'
- - name: select-provider-sa
@@ -177,7 +177,7 @@ spec:
arguments:
parameters:
- name: field
value: image
value: cliImage
- name: provider-config
value: '{{`{{workflow.parameters.provider-config}}`}}'
- - name: select-provider-sa
2 changes: 1 addition & 1 deletion helm/provider/templates/provider.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ metadata:
name: {{ $providerName }}
namespace: {{ include "kfp-operator-provider.namespace" . }}
spec:
image: {{ include "kfp-operator-provider.image" $ }}
cliImage: {{ include "kfp-operator-provider.image" $ }}
executionMode: {{ .Values.provider.executionMode }}
serviceAccount: {{ .Values.provider.serviceAccount.name }}
defaultBeamArgs:

0 comments on commit bea1c4b

Please sign in to comment.