Merge branch 'master' into tahsin/backup

charts/uik8sappscodecom-featureset-opscenter-backup-editor/ui/create-ui.yaml

@@ -90,11 +90,6 @@ steps:
  schema:
  $ref: schema#/properties/resources/properties/helmToolkitFluxcdIoHelmRelease_stash_presets/properties/spec/properties/values/properties/kubestash/properties/backend/properties/s3/properties/spec/properties/insecureTLS
  type: input
- - label:
- text: labels.backend.prefix
- schema:
- $ref: schema#/properties/resources/properties/helmToolkitFluxcdIoHelmRelease_stash_presets/properties/spec/properties/values/properties/kubestash/properties/backend/properties/s3/properties/spec/properties/prefix
- type: input
  - label:
  text: labels.backend.region
  schema:
@@ -296,19 +291,6 @@ steps:
  schema:
  $ref: schema#/properties/resources/properties/helmToolkitFluxcdIoHelmRelease_stash_presets/properties/spec/properties/values/properties/kubestash
  type: single-step-form
- - if: presetType|kubestash
- label:
- text: labels.usePrefix
- options:
- - text: Skip prefix
- value: skip
- - text: Use name as prefix
- value: name
- - text: Use UID as prefix
- value: uid
- schema:
- $ref: schema#/properties/resources/properties/helmToolkitFluxcdIoHelmRelease_stash_presets/properties/spec/properties/values/properties/usePrefix
- type: select
  schema:
  $ref: schema#/properties/resources/properties/helmToolkitFluxcdIoHelmRelease_stash_presets/properties/spec/properties/values
  type: single-step-form

charts/uik8sappscodecom-featureset-opscenter-datastore-editor/ui/functions.js

@@ -428,12 +428,24 @@ async function getDatabaseTypes({
  let enabledTypes = ['Elasticsearch', 'Kafka', 'MariaDB', 'MongoDB', 'MySQL', 'Postgres', 'Redis']
  const owner = storeGet('/route/params/user') || ''
  const cluster = storeGet('/route/params/cluster') || ''
+ const getRoute = storeGet('/route')
+
  if (isFetching === 'success') {
  enabledTypes = getValue(discriminator, '/enabledTypes') || []
  } else if (isFetching !== 'pending') {
  try {
  isFetching = 'pending'
- const resp = await axios.get(`/clusters/${owner}/${cluster}/db-status`)
+
+ const clusterset = getRoute.fullPath.includes('/clustersets/')
+ ? getRoute.fullPath.split('/clustersets/')[1].split('/')[0]
+ : null;
+
+ const url = clusterset
+ ? `/clusters/${owner}/${cluster}/db-status?clusterset=${clusterset}`
+ : `/clusters/${owner}/${cluster}/db-status`;
+
+ const resp = await axios.get(url);
+
  data = resp?.data
  isFetching = 'success'
  if (Object.keys(data).length) {

go.mod

@@ -9,7 +9,7 @@ require (
  k8s.io/api v0.30.2
  k8s.io/apimachinery v0.30.2
  k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2
- kmodules.xyz/client-go v0.30.17
+ kmodules.xyz/client-go v0.30.26
  kmodules.xyz/monitoring-agent-api v0.29.0
  kmodules.xyz/objectstore-api v0.29.1
  kmodules.xyz/offshoot-api v0.30.1

go.sum

@@ -221,8 +221,8 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
-kmodules.xyz/client-go v0.30.17 h1:Ec22XIkAsN8Fwd001P0EzRTsfeibIFkzkZ6oYjLe5LQ=
-kmodules.xyz/client-go v0.30.17/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
+kmodules.xyz/client-go v0.30.26 h1:cPoNid/Eq38EwznsZ27gu2AEXOjqcshn+/7kjlaaQNQ=
+kmodules.xyz/client-go v0.30.26/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
 kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9H1UFRwB4=
 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
 kmodules.xyz/objectstore-api v0.29.1 h1:uUsjf8KU0w4LYowSEOnl0AbHT3hsHIu1wNLHqGe1o6s=

vendor/kmodules.xyz/client-go/api/v1/certificates.go

@@ -59,6 +59,10 @@ type CertificateSpec struct {
  Duration *metav1.Duration `json:"duration,omitempty" protobuf:"bytes,5,opt,name=duration"`
 
  // Certificate renew before expiration duration
+ //
+ // Deprecated use `ReconfigureTLS` type OpsRequest instead.
+ //
+ // +deprecated
  // +optional
  RenewBefore *metav1.Duration `json:"renewBefore,omitempty" protobuf:"bytes,6,opt,name=renewBefore"`
 

vendor/kmodules.xyz/client-go/api/v1/cluster.go

@@ -24,23 +24,21 @@ import (
  "strings"
 )
 
-// +kubebuilder:validation:Enum=Aws;Azure;DigitalOcean;GoogleCloud;Linode;Packet;Scaleway;Vultr;BareMetal;KIND;Generic;Private
+// +kubebuilder:validation:Enum=AKS;DigitalOcean;EKS;Exoscale;Generic;GKE;Linode;Packet;Rancher;Scaleway;Vultr
 type HostingProvider string
 
 const (
- HostingProviderAWS HostingProvider = "Aws"
- HostingProviderAzure HostingProvider = "Azure"
+ HostingProviderAKS HostingProvider = "AKS"
  HostingProviderDigitalOcean HostingProvider = "DigitalOcean"
- HostingProviderGoogleCloud HostingProvider = "GoogleCloud"
+ HostingProviderEKS HostingProvider = "EKS"
  HostingProviderExoscale HostingProvider = "Exoscale"
+ HostingProviderGeneric HostingProvider = "Generic"
+ HostingProviderGKE HostingProvider = "GKE"
  HostingProviderLinode HostingProvider = "Linode"
  HostingProviderPacket HostingProvider = "Packet"
+ HostingProviderRancher HostingProvider = "Rancher"
  HostingProviderScaleway HostingProvider = "Scaleway"
  HostingProviderVultr HostingProvider = "Vultr"
- HostingProviderBareMetal HostingProvider = "BareMetal"
- HostingProviderKIND HostingProvider = "KIND"
- HostingProviderGeneric HostingProvider = "Generic"
- HostingProviderPrivate HostingProvider = "Private"
 )
 
 const (
@@ -56,10 +54,10 @@ type ClusterMetadata struct {
  Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
  DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
  Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
- OwnerID string `json:"ownerID,omitempty"`
- OwnerType string `json:"ownerType,omitempty"`
- APIEndpoint string `json:"apiEndpoint,omitempty"`
- CABundle string `json:"caBundle,omitempty"`
+ OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
+ OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
+ APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
+ CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
 }
 
 func (md ClusterMetadata) State() string {
@@ -153,27 +151,26 @@ func (cm ClusterManager) String() string {
 }
 
 type CAPIClusterInfo struct {
- Provider CAPIProvider `json:"provider"`
- Namespace string `json:"namespace"`
- ClusterName string `json:"clusterName"`
+ Provider CAPIProvider `json:"provider" protobuf:"bytes,1,opt,name=provider,casttype=CAPIProvider"`
+ Namespace string `json:"namespace" protobuf:"bytes,2,opt,name=namespace"`
+ ClusterName string `json:"clusterName" protobuf:"bytes,3,opt,name=clusterName"`
 }
 
 // ClusterInfo used in ace-installer
 type ClusterInfo struct {
- UID string `json:"uid"`
- Name string `json:"name"`
- ClusterManagers []string `json:"clusterManagers"`
+ UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
+ Name string `json:"name" protobuf:"bytes,2,opt,name=name"`
+ ClusterManagers []string `json:"clusterManagers" protobuf:"bytes,3,rep,name=clusterManagers"`
  // +optional
- CAPI CAPIClusterInfo `json:"capi"`
+ CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"`
 }
 
 // +kubebuilder:validation:Enum=capa;capg;capz
 type CAPIProvider string
 
 const (
- CAPIProviderUnknown CAPIProvider = ""
- CAPIProviderCAPA CAPIProvider = "capa"
- CAPIProviderCAPG CAPIProvider = "capg"
- CAPIProviderCAPZ CAPIProvider = "capz"
- CAPIProviderCAPH CAPIProvider = "caph"
+ CAPIProviderCAPA CAPIProvider = "capa"
+ CAPIProviderCAPG CAPIProvider = "capg"
+ CAPIProviderCAPZ CAPIProvider = "capz"
+ CAPIProviderCAPH CAPIProvider = "caph"
 )