From 355f7c3d7efe690c0f91b0f1fe1a534827d4b448 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Thu, 7 Sep 2023 01:56:04 -0700 Subject: [PATCH] Update default variant names Signed-off-by: Tamal Saha --- go.mod | 2 +- go.sum | 4 ++-- .../resource-metadata/apis/ui/v1alpha1/openapi_generated.go | 1 + .../apis/ui/v1alpha1/resourceeditor_types.go | 1 - .../crds/ui.k8s.appscode.com_resourceeditors.yaml | 2 ++ .../ui.k8s.appscode.com/v1alpha1/resourceeditors.yaml | 2 ++ .../resourceeditors/kubedb.com/v1alpha2/elasticsearches.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/kafkas.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/mariadbs.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/memcacheds.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/mongodbs.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/mysqls.yaml | 2 +- .../resourceeditors/kubedb.com/v1alpha2/perconaxtradbs.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/pgbouncers.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/postgreses.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/proxysqls.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/redises.yaml | 2 +- .../resourceeditors/kubedb.com/v1alpha2/redissentinels.yaml | 2 +- .../resourceeditors/kubevault.com/v1alpha2/vaultservers.yaml | 2 +- vendor/modules.txt | 2 +- 21 files changed, 23 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 92ee1d810..e3828e595 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( kmodules.xyz/custom-resources v0.25.1 kmodules.xyz/go-containerregistry v0.0.11 kmodules.xyz/monitoring-agent-api v0.25.1 - kmodules.xyz/resource-metadata v0.17.17-0.20230906213237-4886930f21a3 + kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd kmodules.xyz/resource-metrics v0.25.2 kmodules.xyz/sets v0.25.0 kubeops.dev/scanner v0.0.13-0.20230610152531-83d060ed8780 diff --git a/go.sum b/go.sum index d5d6e67b5..561dc2054 100644 --- a/go.sum +++ b/go.sum @@ -2126,8 +2126,8 @@ kmodules.xyz/monitoring-agent-api v0.25.1 h1:E1H8U/vMfYQ8wevmJv6Lcj0Z4DF7cH3hZ2x kmodules.xyz/monitoring-agent-api v0.25.1/go.mod h1:IphGzRWbuV00B3TLalcBs6+IlchSZVTwKDty+J3LLz4= kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI= kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo= -kmodules.xyz/resource-metadata v0.17.17-0.20230906213237-4886930f21a3 h1:Ify0BsifijnCgVyYc+/AbTNsvrRritoo71+vD3raWCA= -kmodules.xyz/resource-metadata v0.17.17-0.20230906213237-4886930f21a3/go.mod h1:eUV4PXbaIQv40+nwy6ss0lJuVtuz6USKNsiOQIqLVZc= +kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd h1:BgjUYFrxdsf1uH8MFSsXHWxxIhRWQr3JEU8d33Rgrpc= +kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd/go.mod h1:eUV4PXbaIQv40+nwy6ss0lJuVtuz6USKNsiOQIqLVZc= kmodules.xyz/resource-metrics v0.25.2 h1:BwCb6qyunvQBa0u8UUkw+wYG5/T4qtNtAKcHjSsk0JU= kmodules.xyz/resource-metrics v0.25.2/go.mod h1:ZK/52NLuwMk+Jt0bmUtGQHtSxPLYYpsFILG7SJhYPg0= kmodules.xyz/sets v0.25.0 h1:belY/3trp/M/CKc1TEteA40jb2uCIdwKHhjpvrIxG+8= diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go index 3120691d2..cc13b21e6 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go @@ -16357,6 +16357,7 @@ func schema_resource_metadata_apis_ui_v1alpha1_VariantRef(ref common.ReferenceCa }, }, }, + Required: []string{"name"}, }, }, Dependencies: []string{ diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceeditor_types.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceeditor_types.go index ec4916766..fd6b6a894 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceeditor_types.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceeditor_types.go @@ -86,7 +86,6 @@ type ActionTemplate struct { } type VariantRef struct { - // +optional Name string `json:"name"` Title string `json:"title,omitempty"` Description string `json:"description,omitempty"` diff --git a/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceeditors.yaml b/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceeditors.yaml index 35a522aba..5e2f35be6 100644 --- a/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceeditors.yaml +++ b/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceeditors.yaml @@ -357,6 +357,8 @@ spec: x-kubernetes-map-type: atomic title: type: string + required: + - name type: object type: array required: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceeditors.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceeditors.yaml index 899cbbb56..9b2abe992 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceeditors.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceeditors.yaml @@ -311,6 +311,8 @@ spec: x-kubernetes-map-type: atomic title: type: string + required: + - name type: object type: array required: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/elasticsearches.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/elasticsearches.yaml index 5c8e8ab91..76acf5f87 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/elasticsearches.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/elasticsearches.yaml @@ -164,7 +164,7 @@ spec: name: bytebuilders-ui version: sha256:2c6e7157a0f5973e65155f2908fe5e883de4459ac2bafc7b6f4749806159b012 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml index 839a3ba43..a8396406b 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml @@ -36,7 +36,7 @@ spec: name: bytebuilders-ui version: v0.4.17 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/kafkas.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/kafkas.yaml index 23daaebf3..06a35f754 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/kafkas.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/kafkas.yaml @@ -52,7 +52,7 @@ spec: name: bytebuilders-ui version: sha256:7d2fcf7df64e62d38925bbac168c59649fdd55adda2429e38113943853eed841 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mariadbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mariadbs.yaml index 23c9ac272..5d8acc3e1 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mariadbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mariadbs.yaml @@ -177,7 +177,7 @@ spec: name: bytebuilders-ui version: sha256:6e9cec380799eeafb848139494d3d0de475485297281d27dd971ad2bca88f180 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/memcacheds.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/memcacheds.yaml index 08d881a63..bed757141 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/memcacheds.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/memcacheds.yaml @@ -36,7 +36,7 @@ spec: name: bytebuilders-ui version: sha256:fb436aba795c7121f24697d0abaf6b5d1a8e7b3c30cf8eb52a16793591448813 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mongodbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mongodbs.yaml index 46f2dde0e..40f71824f 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mongodbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mongodbs.yaml @@ -177,7 +177,7 @@ spec: name: bytebuilders-ui version: sha256:ebfc8905d9a98089da3bc583cf2e62576d9264ffe729f20fd77cd94922fde9f8 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mysqls.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mysqls.yaml index dfd682384..8f53b3d89 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mysqls.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/mysqls.yaml @@ -177,7 +177,7 @@ spec: name: bytebuilders-ui version: sha256:7d9eff4cadb4b8638390cb75a8e3c76a86fd4b9dfdcf102ce5f8506836bcab41 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/perconaxtradbs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/perconaxtradbs.yaml index f31886ef4..2dc21df06 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/perconaxtradbs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/perconaxtradbs.yaml @@ -36,7 +36,7 @@ spec: name: bytebuilders-ui version: v0.4.17 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/pgbouncers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/pgbouncers.yaml index b5176375e..73e80b6ac 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/pgbouncers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/pgbouncers.yaml @@ -36,7 +36,7 @@ spec: name: bytebuilders-ui version: sha256:af2b77d5a99b5c497b58e7df1e2ee82baed8e01220bd68780aa98bc712200406 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/postgreses.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/postgreses.yaml index f03f2bcee..e13902dec 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/postgreses.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/postgreses.yaml @@ -177,7 +177,7 @@ spec: name: bytebuilders-ui version: sha256:e22514b0c9dd29ac7e973aee1af549cc770cf75a0220e4d2c4124b65e8f56851 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/proxysqls.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/proxysqls.yaml index 916f60110..f377854c4 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/proxysqls.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/proxysqls.yaml @@ -134,7 +134,7 @@ spec: name: bytebuilders-ui version: sha256:adc01967f97439dc735dc6661cb751d3b825dc618287a9872a863e58f9c82ba3 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redises.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redises.yaml index 2c52ef2f2..0365d6e55 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redises.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redises.yaml @@ -177,7 +177,7 @@ spec: name: bytebuilders-ui version: sha256:b4c5ce945788d41aac2348db827e15a7b90ddf71a960da45e6d1431fc2a8349e variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redissentinels.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redissentinels.yaml index 708bd37ff..378d43e82 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redissentinels.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/redissentinels.yaml @@ -29,7 +29,7 @@ spec: name: bytebuilders-ui version: sha256:385e7ad94c15a39ac317320c7923c67d3ca7964d677c185f05475eda00cf17d1 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubevault.com/v1alpha2/vaultservers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubevault.com/v1alpha2/vaultservers.yaml index 4b2fedf2a..ddb14de50 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubevault.com/v1alpha2/vaultservers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubevault.com/v1alpha2/vaultservers.yaml @@ -36,7 +36,7 @@ spec: name: bytebuilders-ui version: sha256:6ee98c68d1340b815196889c5104f964ada8e6e70ba4369423c8bd747ff710d5 variants: - - name: "" + - name: default selector: matchLabels: charts.x-helm.dev/is-default-preset: "true" diff --git a/vendor/modules.txt b/vendor/modules.txt index bb4eb1641..db314a833 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1790,7 +1790,7 @@ kmodules.xyz/monitoring-agent-api/client # kmodules.xyz/offshoot-api v0.25.0 ## explicit; go 1.18 kmodules.xyz/offshoot-api/api/v1 -# kmodules.xyz/resource-metadata v0.17.17-0.20230906213237-4886930f21a3 +# kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd ## explicit; go 1.18 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1