From 5bef2704cb4055daf98793ccbd3cfe555a10a6de Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Thu, 6 Jun 2024 01:49:21 -0700 Subject: [PATCH] Update resource metadata Signed-off-by: Tamal Saha --- go.mod | 2 +- go.sum | 4 ++-- pkg/cmds/server/options.go | 2 +- .../hub/clusterprofiles/ace/dbaas-aks.yaml | 4 ++-- .../hub/clusterprofiles/ace/dbaas-eks.yaml | 11 ++++++----- .../hub/clusterprofiles/ace/dbaas-gke.yaml | 4 ++-- .../v1alpha1/druidautoscalers.yaml | 9 +++++++++ .../v1alpha1/pgpoolautoscalers.yaml | 9 +++++++++ .../v1alpha1/singlestoreautoscalers.yaml | 9 +++++++++ .../v1alpha1/clickhouseversions.yaml | 9 +++++++++ .../v1alpha1/schemaregistryversions.yaml | 9 +++++++++ .../kafka.kubedb.com/v1alpha1/schemaregistries.yaml | 9 +++++++++ .../kubedb.com/v1alpha2/clickhouses.yaml | 9 +++++++++ .../ops.kubedb.com/v1alpha1/druidopsrequests.yaml | 9 +++++++++ .../ops.kubedb.com/v1alpha1/pgpoolopsrequests.yaml | 9 +++++++++ .../v1alpha1/singlestoreopsrequests.yaml | 9 +++++++++ vendor/modules.txt | 2 +- 17 files changed, 105 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index ff2b662a4..d5a567fac 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( kmodules.xyz/custom-resources v0.29.1 kmodules.xyz/go-containerregistry v0.0.12 kmodules.xyz/monitoring-agent-api v0.29.0 - kmodules.xyz/resource-metadata v0.18.6 + kmodules.xyz/resource-metadata v0.18.7-0.20240606075826-3678251ac1f3 kmodules.xyz/resource-metrics v0.29.5 kmodules.xyz/sets v0.29.0 kubeops.dev/falco-ui-server v0.0.3 diff --git a/go.sum b/go.sum index 9448e181c..fed6722ba 100644 --- a/go.sum +++ b/go.sum @@ -921,8 +921,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY= kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw= -kmodules.xyz/resource-metadata v0.18.6 h1:j/hCjJneBb4qS7tG6BDIvlCATej7KDiIpcf3QZ6KyTI= -kmodules.xyz/resource-metadata v0.18.6/go.mod h1:WKwJXM00EFKeDXDF+fjEMwxyZnKs/1SXMj9nt0VbDHs= +kmodules.xyz/resource-metadata v0.18.7-0.20240606075826-3678251ac1f3 h1:WpoyoaUBV3v9khO21GE05/xmVfgknwGHoARIvQUz0Lw= +kmodules.xyz/resource-metadata v0.18.7-0.20240606075826-3678251ac1f3/go.mod h1:WKwJXM00EFKeDXDF+fjEMwxyZnKs/1SXMj9nt0VbDHs= kmodules.xyz/resource-metrics v0.29.5 h1:ciuvRXuXsloLNW/JwkubqbYySsvHvHr6/nhkTL5Sf1o= kmodules.xyz/resource-metrics v0.29.5/go.mod h1:OuG/QobZ7o8GFHl/u3lqaUR0fDZDegxtV8Vdh+MNBD4= kmodules.xyz/sets v0.29.0 h1:ZX/qOECzUob95JhhRtngJElHSlJ1UNNdwK4hTEy+nl0= diff --git a/pkg/cmds/server/options.go b/pkg/cmds/server/options.go index c7e524ecf..04e29224b 100644 --- a/pkg/cmds/server/options.go +++ b/pkg/cmds/server/options.go @@ -55,7 +55,7 @@ func (s *ExtraOptions) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.BaseURL, "baseURL", s.BaseURL, "License server base url") fs.StringVar(&s.Token, "token", s.Token, "License server token") - fs.StringVar(&s.CAFile, "platform-ca-file", s.Token, "Path to platform CA cert file") + fs.StringVar(&s.CAFile, "platform-ca-file", s.CAFile, "Path to platform CA cert file") } func (s *ExtraOptions) ApplyTo(cfg *apiserver.ExtraConfig) error { diff --git a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-aks.yaml b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-aks.yaml index 8800d728f..be490a166 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-aks.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-aks.yaml @@ -6,11 +6,11 @@ metadata: spec: description: This profile is suitable for AKS clusters used as KubeDB managed DBaaS requiredFeatureSets: + capi-core: + - cluster-presets crossplane: - crossplane - kubedb-provider-azure - dbaas-capz: - - capi-cluster-presets opscenter-core: - license-proxyserver opscenter-datastore: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-eks.yaml b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-eks.yaml index 7937452a5..a02cc7564 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-eks.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-eks.yaml @@ -6,14 +6,15 @@ metadata: spec: description: This profile is suitable for EKS clusters used as KubeDB managed DBaaS requiredFeatureSets: - crossplane: - - crossplane - - kubedb-provider-aws - dbaas-capa: - - capi-cluster-presets + capi-capa: - aws-ebs-csi-driver - capa-vpc-peering-operator - cluster-autoscaler + capi-core: + - cluster-presets + crossplane: + - crossplane + - kubedb-provider-aws opscenter-core: - license-proxyserver opscenter-datastore: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-gke.yaml b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-gke.yaml index 294c9b287..1ce3f0e07 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-gke.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/clusterprofiles/ace/dbaas-gke.yaml @@ -6,11 +6,11 @@ metadata: spec: description: This profile is suitable for GKE clusters used as KubeDB managed DBaaS requiredFeatureSets: + capi-core: + - cluster-presets crossplane: - crossplane - kubedb-provider-gcp - dbaas-capg: - - capi-cluster-presets opscenter-core: - license-proxyserver opscenter-datastore: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/druidautoscalers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/druidautoscalers.yaml index 7243e22a1..d3b2a0b46 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/druidautoscalers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/druidautoscalers.yaml @@ -15,3 +15,12 @@ spec: name: druidautoscalers scope: Namespaced version: v1alpha1 + ui: + editor: + name: autoscalingkubedbcom-druidautoscaler-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/pgpoolautoscalers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/pgpoolautoscalers.yaml index 003209821..447565a1f 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/pgpoolautoscalers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/pgpoolautoscalers.yaml @@ -15,3 +15,12 @@ spec: name: pgpoolautoscalers scope: Namespaced version: v1alpha1 + ui: + editor: + name: autoscalingkubedbcom-pgpoolautoscaler-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/singlestoreautoscalers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/singlestoreautoscalers.yaml index cea8d7bc9..d9a9aec40 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/singlestoreautoscalers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/singlestoreautoscalers.yaml @@ -15,3 +15,12 @@ spec: name: singlestoreautoscalers scope: Namespaced version: v1alpha1 + ui: + editor: + name: autoscalingkubedbcom-singlestoreautoscaler-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/clickhouseversions.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/clickhouseversions.yaml index 3abf50db6..f4b363dfd 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/clickhouseversions.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/clickhouseversions.yaml @@ -15,3 +15,12 @@ spec: name: clickhouseversions scope: Cluster version: v1alpha1 + ui: + editor: + name: catalogkubedbcom-clickhouseversion-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/schemaregistryversions.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/schemaregistryversions.yaml index 39245e537..65555985b 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/schemaregistryversions.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/schemaregistryversions.yaml @@ -15,3 +15,12 @@ spec: name: schemaregistryversions scope: Cluster version: v1alpha1 + ui: + editor: + name: catalogkubedbcom-schemaregistryversion-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kafka.kubedb.com/v1alpha1/schemaregistries.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kafka.kubedb.com/v1alpha1/schemaregistries.yaml index 7dd8abc51..32dd758d8 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kafka.kubedb.com/v1alpha1/schemaregistries.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kafka.kubedb.com/v1alpha1/schemaregistries.yaml @@ -15,3 +15,12 @@ spec: name: schemaregistries scope: Namespaced version: v1alpha1 + ui: + editor: + name: kafkakubedbcom-schemaregistry-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml index e5c918b0d..a81516c31 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/kubedb.com/v1alpha2/clickhouses.yaml @@ -15,3 +15,12 @@ spec: name: clickhouses scope: Namespaced version: v1alpha2 + ui: + editor: + name: kubedbcom-clickhouse-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/druidopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/druidopsrequests.yaml index 8d188f353..695c136b8 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/druidopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/druidopsrequests.yaml @@ -15,3 +15,12 @@ spec: name: druidopsrequests scope: Namespaced version: v1alpha1 + ui: + editor: + name: opskubedbcom-druidopsrequest-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/pgpoolopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/pgpoolopsrequests.yaml index 3c5f425bb..4e764ef04 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/pgpoolopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/pgpoolopsrequests.yaml @@ -15,3 +15,12 @@ spec: name: pgpoolopsrequests scope: Namespaced version: v1alpha1 + ui: + editor: + name: opskubedbcom-pgpoolopsrequest-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml index 053b1e81a..b9c2bf9b5 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml @@ -15,3 +15,12 @@ spec: name: singlestoreopsrequests scope: Namespaced version: v1alpha1 + ui: + editor: + name: opskubedbcom-singlestoreopsrequest-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.4.20 + enforceQuota: false diff --git a/vendor/modules.txt b/vendor/modules.txt index 151c6f10c..0f3128cbf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1958,7 +1958,7 @@ kmodules.xyz/monitoring-agent-api/client ## explicit; go 1.21.5 kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 -# kmodules.xyz/resource-metadata v0.18.6 +# kmodules.xyz/resource-metadata v0.18.7-0.20240606075826-3678251ac1f3 ## explicit; go 1.22.0 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1