update api and imports

openshift · Apr 15, 2024 · dcb3044 · dcb3044
1 parent 09a9d6c
commit dcb3044
Show file tree

Hide file tree

Showing 34 changed files with 12,118 additions and 7 deletions.
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -11,14 +11,12 @@ COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/cluster-e
 COPY manifests/ /manifests
 
 # Operator CRD
-COPY vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config-Default.crd.yaml /manifests
+COPY vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml /manifests
+COPY vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml /manifests
+COPY vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml /manifests
 
 # Backup related CRDs
-COPY vendor/github.com/openshift/api/operator/v1alpha1/0000_10_01_etcdbackup-TechPreviewNoUpgrade.crd.yaml /manifests
-COPY vendor/github.com/openshift/api/config/v1alpha1/0000_10_config-operator_01_backup-TechPreviewNoUpgrade.crd.yaml /manifests
-
-# Hardware Speed related CRDs
-COPY vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config-TechPreviewNoUpgrade.crd.yaml /manifests
-COPY vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config-CustomNoUpgrade.crd.yaml /manifests
+COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_10_01_etcdbackup-TechPreviewNoUpgrade.crd.yaml /manifests
+COPY vendor/github.com/openshift/api/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_backup-TechPreviewNoUpgrade.crd.yaml /manifests
 
 LABEL io.openshift.release.operator true
diff --git a/pkg/operator/api.go b/pkg/operator/api.go
@@ -0,0 +1,13 @@
+package operator
+
+// this file is only used to vendor CRD yaml
+
+import (
+	_ "github.com/openshift/api/operator/v1alpha1"
+	_ "github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests"
+
+	_ "github.com/openshift/api/operator/v1"
+	_ "github.com/openshift/api/operator/v1/zz_generated.crd-manifests"
+	// TODO(thomas): do we need to import the HWspeed feature separately?
+	// operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml
+)
diff --git a/...ft/api/operator/v1/zz_generated.crd-manifests/0000_10_config-operator_01_configs.crd.yaml b/...ft/api/operator/v1/zz_generated.crd-manifests/0000_10_config-operator_01_configs.crd.yaml