Merge pull request #1263 from NanaKhadija1980j/cleanup/1222-remove-duplicate-crds

cleanup: remove duplicate sample CRDs (#1222)

Author: OtowoSamuel

charts/stellar-operator/UPGRADE_GUIDE.md

@@ -23,6 +23,7 @@ helm get values stellar-operator -n stellar-system > backup-values.yaml
 # Backup CRD definitions
 kubectl get crd stellarnodes.stellar.org -o yaml > backup-stellarnode-crd.yaml
 kubectl get crd stellarbenchmarks.stellar.org -o yaml > backup-benchmark-crd.yaml
+kubectl get crd benchmarkreports.stellar.org -o yaml > backup-benchmarkreport-crd.yaml
 
 # Backup all StellarNode resources
 kubectl get stellarnodes --all-namespaces -o yaml > backup-stellarnodes.yaml

charts/stellar-operator/templates/crd.yaml

@@ -340,109 +340,3 @@ spec:
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
-
----
-# StellarBenchmark CRD
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: stellarbenchmarks.stellar.org
-  labels: {{- include "stellar-operator.labels" . | nindent 4 }}
-spec:
-  group: stellar.org
-  names:
-    kind: StellarBenchmark
-    listKind: StellarBenchmarkList
-    plural: stellarbenchmarks
-    singular: stellarbenchmark
-    shortNames:
-      - sbench
-  scope: Namespaced
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: Phase
-          type: string
-          jsonPath: .status.phase
-        - name: Target
-          type: string
-          jsonPath: .spec.targetEndpoint
-        - name: Duration
-          type: integer
-          jsonPath: .spec.durationSeconds
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              required:
-                - targetEndpoint
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-
----
-# BenchmarkReport CRD
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: benchmarkreports.stellar.org
-  labels: {{- include "stellar-operator.labels" . | nindent 4 }}
-spec:
-  group: stellar.org
-  names:
-    kind: BenchmarkReport
-    listKind: BenchmarkReportList
-    plural: benchmarkreports
-    singular: benchmarkreport
-    shortNames:
-      - br
-  scope: Namespaced
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: Benchmark
-          type: string
-          jsonPath: .spec.benchmarkRef
-        - name: PeakTPS
-          type: number
-          jsonPath: .spec.metrics.peakTps
-        - name: AvgLedgerMs
-          type: number
-          jsonPath: .spec.metrics.avgLedgerCloseMs
-        - name: P99LatencyMs
-          type: number
-          jsonPath: .spec.metrics.p99ApiLatencyMs
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              required:
-                - benchmarkRef
-                - startedAt
-                - completedAt
-                - targetEndpoint
-                - config
-                - metrics
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true

config/README.md

@@ -131,6 +131,13 @@ and package metadata) is committed.
 kubectl apply -f config/crd/
 ```
 
+Benchmark workloads require the canonical benchmark CRDs (not bundled in the Helm chart):
+
+```bash
+kubectl apply -f config/crd/stellarbenchmark-crd.yaml
+kubectl apply -f config/crd/stellarbenchmarkreport-crd.yaml
+```
+
 ### Apply Sample Resources
 
 ```bash

config/samples/README.md

@@ -17,9 +17,13 @@ This directory contains ready-to-apply sample manifests for testing and developm
 ## Quick Start
 
 ```bash
-# Install the CRD first
+# Install the StellarNode CRD (required)
 kubectl apply -f ../crd/stellarnode-crd.yaml
 
+# For benchmark samples, also install canonical benchmark CRDs:
+kubectl apply -f ../crd/stellarbenchmark-crd.yaml
+kubectl apply -f ../crd/stellarbenchmarkreport-crd.yaml
+
 # Apply the minimal sample
 kubectl apply -f minimal-validator.yaml
 ```