From ca925cd0ce2d0df9f053e31188bbbf46bd704781 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 18 Nov 2024 17:01:24 -0800 Subject: [PATCH] Update resource-metadata Signed-off-by: Tamal Saha --- go.mod | 2 +- go.sum | 4 ++-- .../hub/resourcedescriptors/kubedb.com/v1/mysqls.yaml | 2 ++ .../kubedb.com/v1alpha2/mssqlservers.yaml | 2 -- .../resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml | 2 ++ .../resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml | 7 +++++++ .../ops.kubedb.com/v1alpha1/mssqlserveropsrequests.yaml | 2 ++ .../ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml | 1 + .../autoscaling.kubedb.com/v1alpha1/etcdautoscalers.yaml | 2 +- .../catalog.kubedb.com/v1alpha1/etcdversions.yaml | 2 +- .../hub/resourceeditors/kubedb.com/v1alpha2/etcds.yaml | 2 +- .../meta.k8s.appscode.com/v1alpha1/ClusterProfiles.yaml | 2 +- .../meta.k8s.appscode.com/v1alpha1/gatewayinfoes.yaml | 9 +++++++++ .../ops.kubedb.com/v1alpha1/etcdopsrequests.yaml | 2 +- .../storage.kubestash.com/v1alpha1/snapshots.yaml | 7 ------- .../ui.k8s.appscode.com/v1alpha1/clusterprofiles.yaml | 2 +- vendor/modules.txt | 2 +- 17 files changed, 33 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index b1b8335a3..5e76853e4 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( kmodules.xyz/go-containerregistry v0.0.12 kmodules.xyz/monitoring-agent-api v0.30.4 kmodules.xyz/offshoot-api v0.30.1 - kmodules.xyz/resource-metadata v0.22.3 + kmodules.xyz/resource-metadata v0.22.6-0.20241120021225-d78d324ddc82 kmodules.xyz/resource-metrics v0.30.5 kmodules.xyz/resource-metrics/utils v0.30.4 kmodules.xyz/sets v0.29.0 diff --git a/go.sum b/go.sum index 35ddcaa91..0b13af85a 100644 --- a/go.sum +++ b/go.sum @@ -939,8 +939,8 @@ kmodules.xyz/monitoring-agent-api v0.30.4 h1:6CTKxYJKpWDsDYb0WRBHGFoW3xQof05d+W8 kmodules.xyz/monitoring-agent-api v0.30.4/go.mod h1:ZuTQ5uGi6H80QLsOTuuC7m58dfXDGUv0YB+s059gnr4= kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI= kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g= -kmodules.xyz/resource-metadata v0.22.3 h1:cDxIvOYcWPnv372puDmhB0klHXaaQrV98JloeTkC4wU= -kmodules.xyz/resource-metadata v0.22.3/go.mod h1:zq0gtycDR21iPzhhqrbOGF4lwffIgQ9xiS8T34aJqjk= +kmodules.xyz/resource-metadata v0.22.6-0.20241120021225-d78d324ddc82 h1:CM+e645F76PpWFqSzB+L1j2ViygurqRRvhpj4Armj/4= +kmodules.xyz/resource-metadata v0.22.6-0.20241120021225-d78d324ddc82/go.mod h1:zq0gtycDR21iPzhhqrbOGF4lwffIgQ9xiS8T34aJqjk= kmodules.xyz/resource-metrics v0.30.5 h1:ZhpGeR9DCz1HTrKUg/mWhr95wlFzCPRdgVAqwaggy1o= kmodules.xyz/resource-metrics v0.30.5/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ= kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac= diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1/mysqls.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1/mysqls.yaml index 791be37e6..b441925e7 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1/mysqls.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1/mysqls.yaml @@ -4967,6 +4967,7 @@ spec: default: Single-Primary enum: - Single-Primary + - Multi-Primary type: string name: type: string @@ -4977,6 +4978,7 @@ spec: default: Single-Primary enum: - Single-Primary + - Multi-Primary type: string router: properties: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml index 876d3b10a..302c571f5 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml @@ -4768,8 +4768,6 @@ spec: - name type: object x-kubernetes-map-type: atomic - required: - - clientTLS type: object topology: properties: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml index 3d9985d01..196ec015f 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml @@ -4643,6 +4643,7 @@ spec: default: Single-Primary enum: - Single-Primary + - Multi-Primary type: string name: type: string @@ -4653,6 +4654,7 @@ spec: default: Single-Primary enum: - Single-Primary + - Multi-Primary type: string router: properties: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml index 40af16f2e..e92d3b911 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml @@ -162,9 +162,16 @@ spec: x-kubernetes-map-type: atomic authSecret: properties: + activeFrom: + format: date-time + type: string + externallyManaged: + type: boolean name: default: "" type: string + rotateAfter: + type: string type: object x-kubernetes-map-type: atomic clientAuthSSL: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mssqlserveropsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mssqlserveropsrequests.yaml index 0665bd7d3..8c76f21c4 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mssqlserveropsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/mssqlserveropsrequests.yaml @@ -202,6 +202,8 @@ spec: - alias type: object type: array + clientTLS: + type: boolean issuerRef: properties: apiGroup: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml index 129e739ed..39879a12b 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/pgbounceropsrequests.yaml @@ -232,6 +232,7 @@ spec: - UpdateVersion - Reconfigure - RotateAuth + - Restart type: string updateVersion: properties: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/etcdautoscalers.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/etcdautoscalers.yaml index 8c7fa26c1..6623771b6 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/etcdautoscalers.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/autoscaling.kubedb.com/v1alpha1/etcdautoscalers.yaml @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/etcdversions.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/etcdversions.yaml index a3513b182..2d7d887aa 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/etcdversions.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/catalog.kubedb.com/v1alpha1/etcdversions.yaml @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false 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 fc6333565..837c53c0a 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 @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/ClusterProfiles.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/ClusterProfiles.yaml index 3b99e0e1e..dc9de9a68 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/ClusterProfiles.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/ClusterProfiles.yaml @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/gatewayinfoes.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/gatewayinfoes.yaml index 42383035d..3962800b7 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/gatewayinfoes.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/gatewayinfoes.yaml @@ -15,3 +15,12 @@ spec: name: gatewayinfoes scope: Namespaced version: v1alpha1 + ui: + editor: + name: metak8sappscodecom-gatewayinfo-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: appscode-charts-oci + version: v0.10.0 + enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/etcdopsrequests.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/etcdopsrequests.yaml index 0c3ec6e0b..c48f62c37 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/etcdopsrequests.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ops.kubedb.com/v1alpha1/etcdopsrequests.yaml @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/storage.kubestash.com/v1alpha1/snapshots.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/storage.kubestash.com/v1alpha1/snapshots.yaml index 2cd10c233..c6cf34ea6 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/storage.kubestash.com/v1alpha1/snapshots.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/storage.kubestash.com/v1alpha1/snapshots.yaml @@ -24,10 +24,3 @@ spec: name: appscode-charts-oci version: v0.10.0 enforceQuota: false - options: - name: storagekubestashcom-snapshot-editor-options - sourceRef: - apiGroup: source.toolkit.fluxcd.io - kind: HelmRepository - name: appscode-charts-oci - version: v0.10.0 diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ui.k8s.appscode.com/v1alpha1/clusterprofiles.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ui.k8s.appscode.com/v1alpha1/clusterprofiles.yaml index 2cec30a0e..d0667c59c 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ui.k8s.appscode.com/v1alpha1/clusterprofiles.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/ui.k8s.appscode.com/v1alpha1/clusterprofiles.yaml @@ -22,5 +22,5 @@ spec: apiGroup: source.toolkit.fluxcd.io kind: HelmRepository name: appscode-charts-oci - version: v0.9.0 + version: v0.10.0 enforceQuota: false diff --git a/vendor/modules.txt b/vendor/modules.txt index e8c5a5723..6ed47fcac 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2052,7 +2052,7 @@ kmodules.xyz/monitoring-agent-api/client kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 kmodules.xyz/offshoot-api/util -# kmodules.xyz/resource-metadata v0.22.3 +# kmodules.xyz/resource-metadata v0.22.6-0.20241120021225-d78d324ddc82 ## explicit; go 1.22.1 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1