fix: add applicationset to crds generated by gen-crd-spec (#10833)

* add applicationset to crds generated Signed-off-by: Richard Jennings <richardjennings@gmail.com> * update applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> * remove description from applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> Signed-off-by: Richard Jennings <richardjennings@gmail.com>
argoproj · Oct 7, 2022 · 2fc7c7d · 2fc7c7d
1 parent 0303715
commit 2fc7c7d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/hack/gen-crd-spec/main.go b/hack/gen-crd-spec/main.go
@@ -17,8 +17,9 @@ import (
 
 var (
 	kindToCRDPath = map[string]string{
-		application.ApplicationFullName: "manifests/crds/application-crd.yaml",
-		application.AppProjectFullName:  "manifests/crds/appproject-crd.yaml",
+		application.ApplicationFullName:    "manifests/crds/application-crd.yaml",
+		application.AppProjectFullName:     "manifests/crds/appproject-crd.yaml",
+		application.ApplicationSetFullName: "manifests/crds/applicationset-crd.yaml",
 	}
 )
 
@@ -54,7 +55,7 @@ func getCustomResourceDefinitions() map[string]*extensionsobj.CustomResourceDefi
 			removeValidation(un, "status")
 		}
 
-		crd := toCRD(un)
+		crd := toCRD(un, un.GetName() == "applicationsets.argoproj.io")
 		crd.Labels = map[string]string{
 			"app.kubernetes.io/name":    crd.Name,
 			"app.kubernetes.io/part-of": "argocd",
@@ -81,7 +82,10 @@ func removeValidation(un *unstructured.Unstructured, path string) {
 	unstructured.RemoveNestedField(un.Object, schemaPath...)
 }
 
-func toCRD(un *unstructured.Unstructured) *extensionsobj.CustomResourceDefinition {
+func toCRD(un *unstructured.Unstructured, removeDesc bool) *extensionsobj.CustomResourceDefinition {
+	if removeDesc {
+		removeDescription(un.Object)
+	}
 	unBytes, err := json.Marshal(un)
 	checkErr(err)
 
@@ -92,6 +96,25 @@ func toCRD(un *unstructured.Unstructured) *extensionsobj.CustomResourceDefinitio
 	return &crd
 }
 
+func removeDescription(v interface{}) {
+	switch v := v.(type) {
+	case []interface{}:
+		for _, v := range v {
+			removeDescription(v)
+		}
+	case map[string]interface{}:
+		if _, ok := v["description"]; ok {
+			_, ok := v["description"].(string)
+			if ok {
+				delete(v, "description")
+			}
+		}
+		for _, v := range v {
+			removeDescription(v)
+		}
+	}
+}
+
 func checkErr(err error) {
 	if err != nil {
 		panic(err)

diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
@@ -2159,6 +2159,7 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: applicationsets.argoproj.io
+    app.kubernetes.io/part-of: argocd
   name: applicationsets.argoproj.io
 spec:
   group: argoproj.io

diff --git a/manifests/crds/applicationset-crd.yaml b/manifests/crds/applicationset-crd.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: applicationsets.argoproj.io
+    app.kubernetes.io/part-of: argocd
   name: applicationsets.argoproj.io
 spec:
   group: argoproj.io

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -2159,6 +2159,7 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: applicationsets.argoproj.io
+    app.kubernetes.io/part-of: argocd
   name: applicationsets.argoproj.io
 spec:
   group: argoproj.io

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -2159,6 +2159,7 @@ kind: CustomResourceDefinition
 metadata:
   labels:
     app.kubernetes.io/name: applicationsets.argoproj.io
+    app.kubernetes.io/part-of: argocd
   name: applicationsets.argoproj.io
 spec:
   group: argoproj.io