From bea1c4bee566769719bc5fcb69222e7f8cd46af1 Mon Sep 17 00:00:00 2001 From: Toby Pinfold <28760528+TobyPinfold@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:18:16 +0000 Subject: [PATCH] move cliImage to a new field within providers to allow Image to be used by the upcoming provider deployment --- apis/pipelines/v1alpha6/provider_types.go | 6 +----- config/manager/workflows/common.yaml | 2 +- config/manager/workflows/compiled.yaml | 4 ++-- config/manager/workflows/simple.yaml | 4 ++-- helm/kfp-operator/templates/workflows/common.yaml | 2 +- helm/kfp-operator/templates/workflows/compiled.yaml | 4 ++-- helm/kfp-operator/templates/workflows/simple.yaml | 4 ++-- helm/provider/templates/provider.yaml | 2 +- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/apis/pipelines/v1alpha6/provider_types.go b/apis/pipelines/v1alpha6/provider_types.go index ddc78b1c3..7f8ce9c24 100644 --- a/apis/pipelines/v1alpha6/provider_types.go +++ b/apis/pipelines/v1alpha6/provider_types.go @@ -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) diff --git a/config/manager/workflows/common.yaml b/config/manager/workflows/common.yaml index ff5bc07c6..0dfe98cb0 100644 --- a/config/manager/workflows/common.yaml +++ b/config/manager/workflows/common.yaml @@ -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 diff --git a/config/manager/workflows/compiled.yaml b/config/manager/workflows/compiled.yaml index 552bcd464..e491ee8cf 100644 --- a/config/manager/workflows/compiled.yaml +++ b/config/manager/workflows/compiled.yaml @@ -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 diff --git a/config/manager/workflows/simple.yaml b/config/manager/workflows/simple.yaml index a78793148..88774dbdf 100644 --- a/config/manager/workflows/simple.yaml +++ b/config/manager/workflows/simple.yaml @@ -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 diff --git a/helm/kfp-operator/templates/workflows/common.yaml b/helm/kfp-operator/templates/workflows/common.yaml index 8533a0bd6..a11ad3d69 100644 --- a/helm/kfp-operator/templates/workflows/common.yaml +++ b/helm/kfp-operator/templates/workflows/common.yaml @@ -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 diff --git a/helm/kfp-operator/templates/workflows/compiled.yaml b/helm/kfp-operator/templates/workflows/compiled.yaml index d500009e6..29693b5a4 100644 --- a/helm/kfp-operator/templates/workflows/compiled.yaml +++ b/helm/kfp-operator/templates/workflows/compiled.yaml @@ -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 diff --git a/helm/kfp-operator/templates/workflows/simple.yaml b/helm/kfp-operator/templates/workflows/simple.yaml index 200787ea1..d49c0e428 100644 --- a/helm/kfp-operator/templates/workflows/simple.yaml +++ b/helm/kfp-operator/templates/workflows/simple.yaml @@ -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 diff --git a/helm/provider/templates/provider.yaml b/helm/provider/templates/provider.yaml index f8153093a..23978c5e9 100644 --- a/helm/provider/templates/provider.yaml +++ b/helm/provider/templates/provider.yaml @@ -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: