Remove support for deprecated apis

Remove support for eval, safety and related apis

Signed-off-by: Vaishnavi Hire <vhire@redhat.com>
Assisted-by : claude-4.6-opus

Author: VaishnaviHire

api/v1alpha1/llamastackdistribution_conversion_test.go

@@ -504,8 +504,8 @@ func TestRoundTripV1Alpha2Providers(t *testing.T) {
 				Inference: []v1alpha2.ProviderConfig{
 					{ID: "vllm-1", Provider: "vllm", Endpoint: "http://vllm:8000", Settings: &settings},
 				},
-				Safety: []v1alpha2.ProviderConfig{
-					{Provider: "llama-guard"},
+				Telemetry: []v1alpha2.ProviderConfig{
+					{Provider: "otel"},
 				},
 			},
 		},
@@ -525,8 +525,8 @@ func TestRoundTripV1Alpha2Providers(t *testing.T) {
 	assert.Equal(t, "http://vllm:8000", roundtripped.Spec.Providers.Inference[0].Endpoint)
 	require.NotNil(t, roundtripped.Spec.Providers.Inference[0].Settings)
 	assert.JSONEq(t, `{"temperature":0.7}`, string(roundtripped.Spec.Providers.Inference[0].Settings.Raw))
-	require.Len(t, roundtripped.Spec.Providers.Safety, 1)
-	assert.Equal(t, "llama-guard", roundtripped.Spec.Providers.Safety[0].Provider)
+	require.Len(t, roundtripped.Spec.Providers.Telemetry, 1)
+	assert.Equal(t, "otel", roundtripped.Spec.Providers.Telemetry[0].Provider)
 }
 
 func TestRoundTripV1Alpha2Resources(t *testing.T) {
@@ -539,8 +539,7 @@ func TestRoundTripV1Alpha2Resources(t *testing.T) {
 				Models: []v1alpha2.ModelConfig{
 					{Name: "llama3", Provider: "vllm", ContextLength: &ctxLen, ModelType: "llm"},
 				},
-				Tools:   []string{"code_interpreter"},
-				Shields: []string{"llama-guard"},
+				Tools: []string{"code_interpreter"},
 			},
 		},
 	}
@@ -559,7 +558,6 @@ func TestRoundTripV1Alpha2Resources(t *testing.T) {
 	assert.Equal(t, 8192, *roundtripped.Spec.Resources.Models[0].ContextLength)
 	assert.Equal(t, "llm", roundtripped.Spec.Resources.Models[0].ModelType)
 	assert.Equal(t, []string{"code_interpreter"}, roundtripped.Spec.Resources.Tools)
-	assert.Equal(t, []string{"llama-guard"}, roundtripped.Spec.Resources.Shields)
 }
 
 func TestRoundTripV1Alpha2Storage(t *testing.T) {
@@ -605,7 +603,7 @@ func TestRoundTripV1Alpha2Disabled(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default"},
 		Spec: v1alpha2.LlamaStackDistributionSpec{
 			Distribution: v1alpha2.DistributionSpec{Name: "starter"},
-			Disabled:     []string{"safety", "telemetry"},
+			Disabled:     []string{"agents", "telemetry"},
 		},
 	}
 
@@ -615,7 +613,7 @@ func TestRoundTripV1Alpha2Disabled(t *testing.T) {
 	roundtripped := &v1alpha2.LlamaStackDistribution{}
 	require.NoError(t, v1.ConvertTo(roundtripped))
 
-	assert.Equal(t, []string{"safety", "telemetry"}, roundtripped.Spec.Disabled)
+	assert.Equal(t, []string{"agents", "telemetry"}, roundtripped.Spec.Disabled)
 }
 
 func TestRoundTripV1Alpha2ExternalProviders(t *testing.T) {
@@ -724,7 +722,7 @@ func TestRoundTripV1Alpha2FullCR(t *testing.T) {
 			Storage: &v1alpha2.StateStorageSpec{
 				SQL: &v1alpha2.SQLStorageSpec{Type: "sqlite"},
 			},
-			Disabled: []string{"safety"},
+			Disabled: []string{"agents"},
 			Networking: &v1alpha2.NetworkingSpec{
 				Port:   9000,
 				Expose: &v1alpha2.ExposeConfig{Hostname: "llama.example.com"},
@@ -764,7 +762,7 @@ func TestRoundTripV1Alpha2FullCR(t *testing.T) {
 	require.NotNil(t, roundtripped.Spec.Storage)
 	assert.Equal(t, "sqlite", roundtripped.Spec.Storage.SQL.Type)
 
-	assert.Equal(t, []string{"safety"}, roundtripped.Spec.Disabled)
+	assert.Equal(t, []string{"agents"}, roundtripped.Spec.Disabled)
 
 	require.NotNil(t, roundtripped.Spec.Networking.Expose)
 	assert.Equal(t, "llama.example.com", roundtripped.Spec.Networking.Expose.Hostname)

api/v1alpha2/llamastackdistribution_types.go

@@ -106,11 +106,6 @@ type ProvidersSpec struct {
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:XValidation:rule="self.size() <= 1 || self.all(p, has(p.id))",message="each provider must have an explicit id when multiple providers are specified"
 	Inference []ProviderConfig `json:"inference,omitempty"`
-	// Safety configures safety providers (e.g., llama-guard).
-	// +optional
-	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:XValidation:rule="self.size() <= 1 || self.all(p, has(p.id))",message="each provider must have an explicit id when multiple providers are specified"
-	Safety []ProviderConfig `json:"safety,omitempty"`
 	// VectorIo configures vector I/O providers (e.g., pgvector, chromadb).
 	// +optional
 	// +kubebuilder:validation:MinItems=1
@@ -152,7 +147,7 @@ type ModelConfig struct {
 	Quantization string `json:"quantization,omitempty"`
 }
 
-// ResourcesSpec defines declarative registration of models, tools, and shields.
+// ResourcesSpec defines declarative registration of models and tools.
 type ResourcesSpec struct {
 	// Models to register with inference providers.
 	// +optional
@@ -163,11 +158,6 @@ type ResourcesSpec struct {
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:items:MinLength=1
 	Tools []string `json:"tools,omitempty"`
-	// Shields are safety shield names to register with the safety provider.
-	// +optional
-	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:items:MinLength=1
-	Shields []string `json:"shields,omitempty"`
 }
 
 // KVStorageSpec configures the key-value storage backend.
@@ -423,16 +413,11 @@ type ExternalProvidersSpec struct {
 // +kubebuilder:validation:XValidation:rule="!has(self.overrideConfig) || !has(self.storage)",message="overrideConfig and storage are mutually exclusive"
 // +kubebuilder:validation:XValidation:rule="!has(self.overrideConfig) || !has(self.disabled)",message="overrideConfig and disabled are mutually exclusive"
 // +kubebuilder:validation:XValidation:rule="!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d, d == 'inference') || !has(self.providers.inference) || self.providers.inference.size() == 0",message="inference cannot be both in providers and disabled"
-// +kubebuilder:validation:XValidation:rule="!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d, d == 'safety') || !has(self.providers.safety) || self.providers.safety.size() == 0",message="safety cannot be both in providers and disabled"
 // +kubebuilder:validation:XValidation:rule="!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d, d == 'vector_io') || !has(self.providers.vectorIo) || self.providers.vectorIo.size() == 0",message="vector_io cannot be both in providers and disabled"
 // +kubebuilder:validation:XValidation:rule="!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d, d == 'tool_runtime') || !has(self.providers.toolRuntime) || self.providers.toolRuntime.size() == 0",message="tool_runtime cannot be both in providers and disabled"
 // +kubebuilder:validation:XValidation:rule="!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d, d == 'telemetry') || !has(self.providers.telemetry) || self.providers.telemetry.size() == 0",message="telemetry cannot be both in providers and disabled"
 //
 //nolint:lll // kubebuilder markers cannot be split across lines.
-//nolint:lll // kubebuilder markers cannot be split across lines.
-//nolint:lll // kubebuilder markers cannot be split across lines.
-//nolint:lll // kubebuilder markers cannot be split across lines.
-//nolint:lll // kubebuilder markers cannot be split across lines.
 type LlamaStackDistributionSpec struct {
 	// Distribution identifies the LlamaStack distribution to deploy.
 	// +kubebuilder:validation:Required
@@ -441,7 +426,7 @@ type LlamaStackDistributionSpec struct {
 	// Mutually exclusive with overrideConfig.
 	// +optional
 	Providers *ProvidersSpec `json:"providers,omitempty"`
-	// Resources declares models, tools, and shields to register.
+	// Resources declares models and tools to register.
 	// Mutually exclusive with overrideConfig.
 	// +optional
 	Resources *ResourcesSpec `json:"resources,omitempty"`
@@ -453,7 +438,7 @@ type LlamaStackDistributionSpec struct {
 	// Mutually exclusive with overrideConfig.
 	// +optional
 	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:items:Enum=agents;datasetio;eval;inference;safety;scoring;telemetry;tool_runtime;vector_io
+	// +kubebuilder:validation:items:Enum=agents;inference;telemetry;tool_runtime;vector_io
 	Disabled []string `json:"disabled,omitempty"`
 	// Networking consolidates network configuration.
 	// +optional

api/v1alpha2/llamastackdistribution_webhook.go

@@ -117,7 +117,6 @@ func validateProviderIDUniqueness(spec *ProvidersSpec) field.ErrorList {
 		configs []ProviderConfig
 	}{
 		{"inference", spec.Inference},
-		{"safety", spec.Safety},
 		{"vectorIo", spec.VectorIo},
 		{"toolRuntime", spec.ToolRuntime},
 		{"telemetry", spec.Telemetry},
@@ -203,7 +202,6 @@ func collectAllProviderIDs(spec *ProvidersSpec) map[string]bool {
 	ids := make(map[string]bool)
 	for _, slice := range [][]ProviderConfig{
 		spec.Inference,
-		spec.Safety,
 		spec.VectorIo,
 		spec.ToolRuntime,
 		spec.Telemetry,

api/v1alpha2/llamastackdistribution_webhook_test.go

@@ -80,7 +80,7 @@ func TestValidateDistributionNameEmptyRegistry(t *testing.T) {
 func TestProviderIDUniquenessNoDuplicates(t *testing.T) {
 	spec := &ProvidersSpec{
 		Inference: []ProviderConfig{{Provider: "vllm"}},
-		Safety:    []ProviderConfig{{Provider: "llama-guard"}},
+		Telemetry: []ProviderConfig{{Provider: "otel"}},
 	}
 	errs := validateProviderIDUniqueness(spec)
 	assert.Empty(t, errs)
@@ -89,7 +89,7 @@ func TestProviderIDUniquenessNoDuplicates(t *testing.T) {
 func TestProviderIDUniquenessExplicitIDs(t *testing.T) {
 	spec := &ProvidersSpec{
 		Inference: []ProviderConfig{{ID: "my-provider", Provider: "vllm"}},
-		Safety:    []ProviderConfig{{ID: "my-provider", Provider: "llama-guard"}},
+		Telemetry: []ProviderConfig{{ID: "my-provider", Provider: "otel"}},
 	}
 	errs := validateProviderIDUniqueness(spec)
 	require.Len(t, errs, 1)
@@ -114,12 +114,12 @@ func TestProviderIDUniquenessEmptySlices(t *testing.T) {
 
 func TestProviderIDUniquenessMultipleCollisions(t *testing.T) {
 	spec := &ProvidersSpec{
-		Inference: []ProviderConfig{{ID: "dup", Provider: "vllm"}},
-		Safety:    []ProviderConfig{{ID: "dup", Provider: "guard"}},
-		Telemetry: []ProviderConfig{{ID: "dup", Provider: "otel"}},
+		Inference:   []ProviderConfig{{ID: "dup", Provider: "vllm"}},
+		VectorIo:    []ProviderConfig{{ID: "dup", Provider: "pgvector"}},
+		Telemetry:   []ProviderConfig{{ID: "dup", Provider: "otel"}},
 	}
 	errs := validateProviderIDUniqueness(spec)
-	assert.Len(t, errs, 2, "should report conflict for safety and telemetry")
+	assert.Len(t, errs, 2, "should report conflict for vectorIo and telemetry")
 }
 
 // --- Provider reference validation ---
@@ -188,16 +188,14 @@ func TestCollectAllProviderIDs(t *testing.T) {
 			{ID: "my-vllm", Provider: "vllm"},
 			{Provider: "remote::ollama"},
 		},
-		Safety:   []ProviderConfig{{Provider: "llama-guard"}},
 		VectorIo: []ProviderConfig{{ID: "pgvec", Provider: "pgvector"}},
 	}
 
 	ids := collectAllProviderIDs(spec)
 	assert.True(t, ids["my-vllm"])
 	assert.True(t, ids["ollama"], "remote::ollama derives to ollama")
-	assert.True(t, ids["llama-guard"])
 	assert.True(t, ids["pgvec"])
-	assert.Len(t, ids, 4)
+	assert.Len(t, ids, 3)
 }
 
 // --- Full validate (integration-style) ---
@@ -236,7 +234,7 @@ func TestValidateCreateRejectsDuplicateProviderIDs(t *testing.T) {
 		Distribution: DistributionSpec{Name: "starter"},
 		Providers: &ProvidersSpec{
 			Inference: []ProviderConfig{{ID: "dup", Provider: "vllm"}},
-			Safety:    []ProviderConfig{{ID: "dup", Provider: "guard"}},
+			Telemetry: []ProviderConfig{{ID: "dup", Provider: "otel"}},
 		},
 	})
 

api/v1alpha2/zz_generated.deepcopy.go

@@ -2838,11 +2838,7 @@ spec:
                 items:
                   enum:
                   - agents
-                  - datasetio
-                  - eval
                   - inference
-                  - safety
-                  - scoring
                   - telemetry
                   - tool_runtime
                   - vector_io
@@ -3041,72 +3037,6 @@ spec:
                     - message: each provider must have an explicit id when multiple
                         providers are specified
                       rule: self.size() <= 1 || self.all(p, has(p.id))
-                  safety:
-                    description: Safety configures safety providers (e.g., llama-guard).
-                    items:
-                      description: ProviderConfig defines the configuration for a
-                        single LlamaStack provider instance.
-                      properties:
-                        endpoint:
-                          description: Endpoint is the provider endpoint URL. Maps
-                            to config.url in config.yaml.
-                          type: string
-                        id:
-                          description: |-
-                            ID is a unique provider identifier. Required when multiple providers are
-                            configured for the same API type. Auto-generated from provider when omitted
-                            for single-provider configurations.
-                          type: string
-                        provider:
-                          description: |-
-                            Provider is the provider type (e.g., "vllm", "llama-guard", "pgvector").
-                            Maps to provider_type with "remote::" prefix in config.yaml.
-                          minLength: 1
-                          type: string
-                        secretRefs:
-                          additionalProperties:
-                            description: SecretKeyRef references a specific key in
-                              a Kubernetes Secret.
-                            properties:
-                              key:
-                                description: Key is the key within the Secret.
-                                minLength: 1
-                                type: string
-                              name:
-                                description: Name is the name of the Kubernetes Secret.
-                                minLength: 1
-                                type: string
-                            required:
-                            - key
-                            - name
-                            type: object
-                          description: |-
-                            SecretRefs is a map of named secret references for provider-specific
-                            connection fields (e.g., host, password). Each key becomes the env var
-                            field suffix and maps to config.<key> with env var substitution:
-                            ${env.LLSD_<PROVIDER_ID>_<KEY>}. Use this instead of embedding
-                            secretKeyRef inside settings.
-                          minProperties: 1
-                          type: object
-                        settings:
-                          description: |-
-                            Settings contains provider-specific settings merged into the provider's
-                            config section in config.yaml. Acts as an escape hatch for fields not
-                            directly exposed in the CRD schema. Passed through as-is without any
-                            secret resolution. Use secretRefs for secret values.
-                          x-kubernetes-preserve-unknown-fields: true
-                      required:
-                      - provider
-                      type: object
-                      x-kubernetes-validations:
-                      - message: id must not be empty if specified
-                        rule: '!has(self.id) || self.id.size() > 0'
-                    minItems: 1
-                    type: array
-                    x-kubernetes-validations:
-                    - message: each provider must have an explicit id when multiple
-                        providers are specified
-                      rule: self.size() <= 1 || self.all(p, has(p.id))
                   telemetry:
                     description: Telemetry configures telemetry providers (e.g., opentelemetry).
                     items:
@@ -3309,7 +3239,7 @@ spec:
                 type: object
               resources:
                 description: |-
-                  Resources declares models, tools, and shields to register.
+                  Resources declares models and tools to register.
                   Mutually exclusive with overrideConfig.
                 properties:
                   models:
@@ -3349,14 +3279,6 @@ spec:
                           > 0'
                     minItems: 1
                     type: array
-                  shields:
-                    description: Shields are safety shield names to register with
-                      the safety provider.
-                    items:
-                      minLength: 1
-                      type: string
-                    minItems: 1
-                    type: array
                   tools:
                     description: Tools are tool group names to register with the toolRuntime
                       provider.
@@ -5937,10 +5859,6 @@ spec:
               rule: '!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d,
                 d == ''inference'') || !has(self.providers.inference) || self.providers.inference.size()
                 == 0'
-            - message: safety cannot be both in providers and disabled
-              rule: '!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d,
-                d == ''safety'') || !has(self.providers.safety) || self.providers.safety.size()
-                == 0'
             - message: vector_io cannot be both in providers and disabled
               rule: '!has(self.providers) || !has(self.disabled) || !self.disabled.exists(d,
                 d == ''vector_io'') || !has(self.providers.vectorIo) || self.providers.vectorIo.size()

config/crd/bases/llamastack.io_llamastackdistributions.yaml

@@ -42,8 +42,6 @@ spec:
       connectionString:
         name: pg-credentials
         key: dsn
-  disabled:
-    - safety
   workload:
     replicas: 2
     resources:

config/samples/v1alpha2/example-vllm-postgres.yaml

@@ -410,7 +410,6 @@ func collectProviderIDs(spec *v1alpha2.ProvidersSpec) map[string]bool {
 
 	for _, slice := range [][]v1alpha2.ProviderConfig{
 		spec.Inference,
-		spec.Safety,
 		spec.VectorIo,
 		spec.ToolRuntime,
 		spec.Telemetry,