Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for release v0.7.0 #163

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ require (
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/klog/v2 v2.130.1
kmodules.xyz/client-go v0.30.44
kmodules.xyz/client-go v0.30.45
kmodules.xyz/custom-resources v0.30.0
kubedb.dev/apimachinery v0.52.0-rc.0
kubedb.dev/apimachinery v0.52.0
sigs.k8s.io/controller-runtime v0.18.4
xorm.io/xorm v1.3.6
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -655,16 +655,16 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/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.44 h1:mLOBXQhvCIhdega9WoN4Px/usqobuKTT2vOPQcbGhXQ=
kmodules.xyz/client-go v0.30.44/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
kmodules.xyz/client-go v0.30.45 h1:hSjNlJoPQ86CKS8BiEbSmBkF2+yWsFjjMFISOCVJ6aA=
kmodules.xyz/client-go v0.30.45/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+aYy2EiKaw=
kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
kubedb.dev/apimachinery v0.52.0-rc.0 h1:9DUShkQGjSINbxgj9/mC2/r6GtFZmJuBOc6RrxzCgB8=
kubedb.dev/apimachinery v0.52.0-rc.0/go.mod h1:5v0QfKvvx9/LasI3561/gIzz9Y9gwmvN3Xm94jdzfMI=
kubedb.dev/apimachinery v0.52.0 h1:rX2whAbjVYYOL+vly7qOsWZjMIWskoH/LD1FzSBLJCE=
kubedb.dev/apimachinery v0.52.0/go.mod h1:zoBQg5LAlidAPRpkPBKPR1IYF7dsvyj3Sf84dMpITKo=
kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744=
Expand Down
2 changes: 1 addition & 1 deletion vendor/kmodules.xyz/client-go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ lint: $(BUILD_DIRS)
--env GO111MODULE=on \
--env GOFLAGS="-mod=vendor" \
$(BUILD_IMAGE) \
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default

$(BUILD_DIRS):
@mkdir -p $@
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/apiextensions/v1/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ func TryUpdateCustomResourceDefinition(
klog.Errorf("Attempt %d failed to update CustomResourceDefinition %s due to %v.", attempt, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update CustomResourceDefinition %s after %d attempts due to %v", name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/apps/v1/daemonset.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdateDaemonSet(ctx context.Context, c kubernetes.Interface, meta metav1
klog.Errorf("Attempt %d failed to update DaemonSet %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update DaemonSet %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/apps/v1/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func TryUpdateDeployment(ctx context.Context, c kubernetes.Interface, meta metav
klog.Errorf("Attempt %d failed to update Deployment %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Deployment %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/apps/v1/replicaset.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func TryUpdateReplicaSet(ctx context.Context, c kubernetes.Interface, meta metav
klog.Errorf("Attempt %d failed to update ReplicaSet %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update ReplicaSet %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/apps/v1/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func TryUpdateStatefulSet(ctx context.Context, c kubernetes.Interface, meta meta
klog.Errorf("Attempt %d failed to update StatefulSet %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update StatefulSet %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdateConfigMap(ctx context.Context, c kubernetes.Interface, meta metav1
klog.Errorf("Attempt %d failed to update ConfigMap %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update ConfigMap %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdateEvent(ctx context.Context, c kubernetes.Interface, meta metav1.Obj
klog.Errorf("Attempt %d failed to update Event %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Event %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ func TryUpdateNode(ctx context.Context, c kubernetes.Interface, meta metav1.Obje
klog.Errorf("Attempt %d failed to update Node %s due to %v.", attempt, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Node %s after %d attempts due to %v", meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdatePod(ctx context.Context, c kubernetes.Interface, meta metav1.Objec
klog.Errorf("Attempt %d failed to update Pod %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Pod %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/pv.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdatePV(ctx context.Context, c kubernetes.Interface, meta metav1.Object
klog.Errorf("Attempt %d failed to update PersistentVolume %s due to %v.", attempt, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update PersistentVolume %s after %d attempts due to %v", meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/pvc.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdatePVC(ctx context.Context, c kubernetes.Interface, meta metav1.Objec
klog.Errorf("Attempt %d failed to update PersistentVolumeClaim %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update PersistentVolumeClaim %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/rc.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func TryUpdateRC(ctx context.Context, c kubernetes.Interface, meta metav1.Object
klog.Errorf("Attempt %d failed to update ReplicationController %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update ReplicationController %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ func TryUpdateSecret(ctx context.Context, c kubernetes.Interface, meta metav1.Ob
klog.Errorf("Attempt %d failed to update Secret %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Secret %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdateService(ctx context.Context, c kubernetes.Interface, meta metav1.O
klog.Errorf("Attempt %d failed to update Service %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update Service %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/core/v1/serviceaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func TryUpdateServiceAccount(ctx context.Context, c kubernetes.Interface, meta m
klog.Errorf("Attempt %d failed to update ServiceAccount %s/%s due to %v.", attempt, cur.Namespace, cur.Name, e2)
return false, nil
})

if err != nil {
err = errors.Errorf("failed to update ServiceAccount %s/%s after %d attempts due to %v", meta.Namespace, meta.Name, attempt, err)
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ var (
},
}

// DefaultResourcesMemoryIntensive must be used for elasticsearch
// DefaultResourcesMemoryIntensive must be used for elasticsearch or kafka
// to avoid OOMKILLED while deploying ES V8
DefaultResourcesMemoryIntensive = core.ResourceRequirements{
Requests: core.ResourceList{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ func (k *Kafka) SetDefaults() {

dbContainer := coreutil.GetContainerByName(k.Spec.Topology.Controller.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}

Expand All @@ -372,7 +372,7 @@ func (k *Kafka) SetDefaults() {

dbContainer := coreutil.GetContainerByName(k.Spec.Topology.Broker.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
} else {
Expand All @@ -383,7 +383,7 @@ func (k *Kafka) SetDefaults() {

dbContainer := coreutil.GetContainerByName(k.Spec.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
k.SetDefaultEnvs()
Expand Down
12 changes: 12 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1/mariadb_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,18 @@ func (m *MariaDB) SetDefaults(mdVersion *v1alpha1.MariaDBVersion) {
if m.IsCluster() && m.IsMariaDBReplication() {
m.SetDefaultsMaxscale(mdVersion, m.Spec.Topology.MaxScale)
}

if m.Spec.Init != nil && m.Spec.Init.Archiver != nil {
if m.Spec.Init.Archiver.EncryptionSecret != nil && m.Spec.Init.Archiver.EncryptionSecret.Namespace == "" {
m.Spec.Init.Archiver.EncryptionSecret.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.FullDBRepository != nil && m.Spec.Init.Archiver.FullDBRepository.Namespace == "" {
m.Spec.Init.Archiver.FullDBRepository.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.ManifestRepository != nil && m.Spec.Init.Archiver.ManifestRepository.Namespace == "" {
m.Spec.Init.Archiver.ManifestRepository.Namespace = m.GetNamespace()
}
}
}

func (m *MariaDB) SetDefaultsMaxscale(mdVersion *v1alpha1.MariaDBVersion, maxscale *MaxScaleSpec) {
Expand Down
12 changes: 12 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1/mongodb_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,18 @@ func (m *MongoDB) SetDefaults(mgVersion *v1alpha1.MongoDBVersion) {
m.Spec.Monitor.Prometheus.Exporter.SecurityContext.RunAsGroup = mgVersion.Spec.SecurityContext.RunAsGroup
}
}

if m.Spec.Init != nil && m.Spec.Init.Archiver != nil {
if m.Spec.Init.Archiver.EncryptionSecret != nil && m.Spec.Init.Archiver.EncryptionSecret.Namespace == "" {
m.Spec.Init.Archiver.EncryptionSecret.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.FullDBRepository != nil && m.Spec.Init.Archiver.FullDBRepository.Namespace == "" {
m.Spec.Init.Archiver.FullDBRepository.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.ManifestRepository != nil && m.Spec.Init.Archiver.ManifestRepository.Namespace == "" {
m.Spec.Init.Archiver.ManifestRepository.Namespace = m.GetNamespace()
}
}
}

func (m *MongoDB) initializePodTemplates() {
Expand Down
12 changes: 12 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1/mysql_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,18 @@ func (m *MySQL) SetDefaults(myVersion *v1alpha1.MySQLVersion) {
if m.Spec.Init != nil && m.Spec.Init.Archiver != nil && m.Spec.Init.Archiver.ReplicationStrategy == nil {
m.Spec.Init.Archiver.ReplicationStrategy = ptr.To(ReplicationStrategyNone)
}

if m.Spec.Init != nil && m.Spec.Init.Archiver != nil {
if m.Spec.Init.Archiver.EncryptionSecret != nil && m.Spec.Init.Archiver.EncryptionSecret.Namespace == "" {
m.Spec.Init.Archiver.EncryptionSecret.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.FullDBRepository != nil && m.Spec.Init.Archiver.FullDBRepository.Namespace == "" {
m.Spec.Init.Archiver.FullDBRepository.Namespace = m.GetNamespace()
}
if m.Spec.Init.Archiver.ManifestRepository != nil && m.Spec.Init.Archiver.ManifestRepository.Namespace == "" {
m.Spec.Init.Archiver.ManifestRepository.Namespace = m.GetNamespace()
}
}
}

func (m *MySQL) SetTLSDefaults() {
Expand Down
Loading
Loading