diff --git a/Makefile b/Makefile index 171c6ef6..be1fa0e3 100644 --- a/Makefile +++ b/Makefile @@ -83,8 +83,10 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust stripped-down-crds: manifests cd config/crd/bases && \ for f in *.yaml; do \ - gojsontoyaml -yamltojson < $$f | jq 'walk(if type == "object" then with_entries(if .value|type=="object" then . else select(.key | test("description") | not) end) else . end)' | gojsontoyaml > ../../../charts/whizard/crds/$$f; \ - done; + echo "---" > ../../../charts/whizard/crds/$$f; \ + gojsontoyaml -yamltojson < $$f | jq 'walk(if type == "object" then with_entries(if .value|type=="object" then . else select(.key | test("description") | not) end) else . end)' | gojsontoyaml >> ../../../charts/whizard/crds/$$f; \ + done && \ + cp -rf ../../../charts/whizard/crds ../../../charts/whizard-crds/; generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. diff --git a/charts/whizard-crds/chart.yaml b/charts/whizard-crds/Chart.yaml similarity index 82% rename from charts/whizard-crds/chart.yaml rename to charts/whizard-crds/Chart.yaml index d53933e4..111c70a0 100644 --- a/charts/whizard-crds/chart.yaml +++ b/charts/whizard-crds/Chart.yaml @@ -9,15 +9,23 @@ description: A Helm chart delivering whizard CRDS # Library charts provide useful utilities or functions for the chart developer. They're included as # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. -#type: application +type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.0 +version: 0.10.1 + +maintainers: + - name: benjaminhuo + email: benjamin@kubesphere.io + - name: frezes + email: junhaozhang@kubesphere.io + - name: junot + email: junotxiang@kubesphere.io # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.10.0" \ No newline at end of file +appVersion: "0.10.0" diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_compactors.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_compactors.yaml index ff6420f8..6738bb37 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_compactors.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_compactors.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_gateways.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_gateways.yaml index 52bd0cd7..efa868df 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_gateways.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_gateways.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_ingesters.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_ingesters.yaml index fd8741a3..abb67e9b 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_ingesters.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_ingesters.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_queries.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_queries.yaml index 3add4853..5fd93b63 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_queries.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_queries.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_queryfrontends.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_queryfrontends.yaml index e2906a9a..3b29eeb0 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_queryfrontends.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_queryfrontends.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_routers.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_routers.yaml index 2f8c177a..c14ac846 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_routers.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_routers.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_rulers.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_rulers.yaml index a7288eac..45fd2bd8 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_rulers.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_rulers.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_services.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_services.yaml index 9846e3e5..789f276f 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_services.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_services.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_storages.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_storages.yaml index ac3781b1..32271b81 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_storages.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_storages.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_stores.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_stores.yaml index 1eb3389c..5b1a215e 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_stores.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_stores.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/crds/monitoring.whizard.io_tenants.yaml b/charts/whizard-crds/crds/monitoring.whizard.io_tenants.yaml index 361d4b25..2e80d27c 100644 --- a/charts/whizard-crds/crds/monitoring.whizard.io_tenants.yaml +++ b/charts/whizard-crds/crds/monitoring.whizard.io_tenants.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard-crds/values.yaml b/charts/whizard-crds/values.yaml index f72a9ded..2500292d 100644 --- a/charts/whizard-crds/values.yaml +++ b/charts/whizard-crds/values.yaml @@ -1 +1 @@ -# Default values for whizard-crds \ No newline at end of file +# Default values for whizard-crds diff --git a/charts/whizard/Chart.yaml b/charts/whizard/Chart.yaml index 7eb330ef..69f47a9b 100644 --- a/charts/whizard/Chart.yaml +++ b/charts/whizard/Chart.yaml @@ -14,5 +14,5 @@ maintainers: email: junhaozhang@kubesphere.io - name: junot email: junotxiang@kubesphere.io -version: 0.10.14 +version: 0.10.15 appVersion: "latest" diff --git a/charts/whizard/crds/monitoring.whizard.io_compactors.yaml b/charts/whizard/crds/monitoring.whizard.io_compactors.yaml index ff6420f8..6738bb37 100644 --- a/charts/whizard/crds/monitoring.whizard.io_compactors.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_compactors.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_gateways.yaml b/charts/whizard/crds/monitoring.whizard.io_gateways.yaml index 52bd0cd7..efa868df 100644 --- a/charts/whizard/crds/monitoring.whizard.io_gateways.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_gateways.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_ingesters.yaml b/charts/whizard/crds/monitoring.whizard.io_ingesters.yaml index fd8741a3..abb67e9b 100644 --- a/charts/whizard/crds/monitoring.whizard.io_ingesters.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_ingesters.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_queries.yaml b/charts/whizard/crds/monitoring.whizard.io_queries.yaml index 3add4853..5fd93b63 100644 --- a/charts/whizard/crds/monitoring.whizard.io_queries.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_queries.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_queryfrontends.yaml b/charts/whizard/crds/monitoring.whizard.io_queryfrontends.yaml index e2906a9a..3b29eeb0 100644 --- a/charts/whizard/crds/monitoring.whizard.io_queryfrontends.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_queryfrontends.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_routers.yaml b/charts/whizard/crds/monitoring.whizard.io_routers.yaml index 2f8c177a..c14ac846 100644 --- a/charts/whizard/crds/monitoring.whizard.io_routers.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_routers.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_rulers.yaml b/charts/whizard/crds/monitoring.whizard.io_rulers.yaml index a7288eac..45fd2bd8 100644 --- a/charts/whizard/crds/monitoring.whizard.io_rulers.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_rulers.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_services.yaml b/charts/whizard/crds/monitoring.whizard.io_services.yaml index 9846e3e5..789f276f 100644 --- a/charts/whizard/crds/monitoring.whizard.io_services.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_services.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_storages.yaml b/charts/whizard/crds/monitoring.whizard.io_storages.yaml index ac3781b1..32271b81 100644 --- a/charts/whizard/crds/monitoring.whizard.io_storages.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_storages.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_stores.yaml b/charts/whizard/crds/monitoring.whizard.io_stores.yaml index 1eb3389c..5b1a215e 100644 --- a/charts/whizard/crds/monitoring.whizard.io_stores.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_stores.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/whizard/crds/monitoring.whizard.io_tenants.yaml b/charts/whizard/crds/monitoring.whizard.io_tenants.yaml index 361d4b25..2e80d27c 100644 --- a/charts/whizard/crds/monitoring.whizard.io_tenants.yaml +++ b/charts/whizard/crds/monitoring.whizard.io_tenants.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: