Skip to content
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
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ require (
kmodules.xyz/client-go v0.34.3
kmodules.xyz/custom-resources v0.34.0
kmodules.xyz/monitoring-agent-api v0.34.1
kubedb.dev/apimachinery v0.61.0
kubedb.dev/db-client-go v0.16.0
kubedb.dev/apimachinery v0.62.0
kubedb.dev/db-client-go v0.17.0
kubeops.dev/petset v0.0.15
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/yaml v1.6.0
Expand Down Expand Up @@ -151,7 +151,7 @@ require (
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
gomodules.xyz/mergo v0.3.13 // indirect
gomodules.xyz/password-generator v0.2.9 // indirect
gomodules.xyz/restic v0.1.0 // indirect
gomodules.xyz/restic v0.2.0 // indirect
gomodules.xyz/sets v0.2.1 // indirect
gomodules.xyz/sync v0.1.0 // indirect
gomodules.xyz/wait v0.2.0 // indirect
Expand All @@ -173,8 +173,8 @@ require (
kubeops.dev/csi-driver-cacerts v0.5.0 // indirect
kubeops.dev/operator-shard-manager v0.0.5 // indirect
kubeops.dev/sidekick v0.0.12 // indirect
kubestash.dev/apimachinery v0.24.0 // indirect
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6 // indirect
kubestash.dev/apimachinery v0.25.0 // indirect
open-cluster-management.io/api v1.2.0 // indirect
sigs.k8s.io/gateway-api v1.4.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.20.1 // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,8 @@ gomodules.xyz/password-generator v0.2.9 h1:qYoXoA61+9zs9A1scffefCgcRGpi9Tw1LsTkI
gomodules.xyz/password-generator v0.2.9/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
gomodules.xyz/pointer v0.1.0 h1:sG2UKrYVSo6E3r4itAjXfPfe4fuXMi0KdyTHpR3vGCg=
gomodules.xyz/pointer v0.1.0/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
gomodules.xyz/restic v0.1.0 h1:CWf2yxPqM6VeNj57ao1QSxrUDEjziv9ewl7YnKe3eB8=
gomodules.xyz/restic v0.1.0/go.mod h1:Api8DksK5irIRJGjnxt7wSxsJ6AsSu3i97bQVRaQ5zs=
gomodules.xyz/restic v0.2.0 h1:6caROiG5Q8s8/ZTcQTnUgSmZXUhrKobMYzs9o9NS+CE=
gomodules.xyz/restic v0.2.0/go.mod h1:Api8DksK5irIRJGjnxt7wSxsJ6AsSu3i97bQVRaQ5zs=
gomodules.xyz/runtime v0.3.0 h1:Fgf3fjIE3xY/sswO73iRBeR3mundZAjlY42fQPigPR0=
gomodules.xyz/runtime v0.3.0/go.mod h1:lJuiayVYjz8LWDwKhbDqFzUrXqr1btLbJS5/lKDz1YU=
gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
Expand Down Expand Up @@ -752,10 +752,10 @@ kmodules.xyz/prober v0.34.0 h1:ElZkZYCjLaytAA0M8EH42To7i9gh1IIX+d0qfaIohys=
kmodules.xyz/prober v0.34.0/go.mod h1:rsu/fxxfNxY70GDbH6Ju8G66459hi7AhWSSBoiIp8ic=
kmodules.xyz/resource-metadata v0.42.4 h1:nFVo+PKmwWdzVwk7U3VZuKBQj3tPo6fyY5BC7gE2OB8=
kmodules.xyz/resource-metadata v0.42.4/go.mod h1:++18wSB28Wrw3ZxnOd8o8IVg7oMyWPwaPfuLw21QnPc=
kubedb.dev/apimachinery v0.61.0 h1:gYI8RFr6W9k9+961fwoWz/6DVGmX0NwPXlTzPBYKxB4=
kubedb.dev/apimachinery v0.61.0/go.mod h1:LaumaEPYGkieolZcvmT75qqZxKbcN0mZ4xIuA85TZaY=
kubedb.dev/db-client-go v0.16.0 h1:mvlFoVQfyvzxegVHz07IXbzhTDdYOTz3zsm3PJZ//PE=
kubedb.dev/db-client-go v0.16.0/go.mod h1:W4tETd5ZYrVL5fFM0Kn2uF2wyLWMgllnMqfJADu3Gak=
kubedb.dev/apimachinery v0.62.0 h1:itdRIV6cQ9w8qbYFYyuJHSbmpNk2nR+MAiXTsMBca3g=
kubedb.dev/apimachinery v0.62.0/go.mod h1:O9Lo4Trr/HWs4OX/iLbGJEnD9pev0b6tcTPbjRCjh1A=
kubedb.dev/db-client-go v0.17.0 h1:wmdXM+3zp9hjyq8isCNhHtG4nbCJ7YFgxNtov32mhLk=
kubedb.dev/db-client-go v0.17.0/go.mod h1:3U2oKDZZyWtVjet4mqtPBPDEDsCdcurgQYN+lJzc4mU=
kubeops.dev/csi-driver-cacerts v0.5.0 h1:WaKfoIyh7rx9rNZ65wJ3GkzhECkOjxd9dcO0iEx3xKU=
kubeops.dev/csi-driver-cacerts v0.5.0/go.mod h1:VNbwC3gTWfmdQCVxd8mkVx+n1+0F1lOA5X3usyZN1rk=
kubeops.dev/operator-shard-manager v0.0.5 h1:i7VnyUfIa9u3RQhSTVWNsooXcgmrWWxJyI9gJ10onE8=
Expand All @@ -764,10 +764,10 @@ kubeops.dev/petset v0.0.15 h1:iwTRFAp0RNw0A87sw2c97UZ6WIA9H/nhJBpDhXLa7fk=
kubeops.dev/petset v0.0.15/go.mod h1:sw96WiXfzhpmKpXj4a5AdmEHs0Bx4QMhf+iW15zY4Gg=
kubeops.dev/sidekick v0.0.12 h1:pmUjQLZDKxgREiM6z0PogLR1aDbgvkE9jRjbxG6dEt0=
kubeops.dev/sidekick v0.0.12/go.mod h1:RU7QH3E8DOLw15rBYlOOJSyczuwAnVVtYyZjJb00UB8=
kubestash.dev/apimachinery v0.24.0 h1:NLPLHAyN/TpPP4kA9NMQT1Lg/CTlCzBqGP/aybVdlN8=
kubestash.dev/apimachinery v0.24.0/go.mod h1:OV3Iq2tVRAW7k7LsukL+R33I5H/gfT2YddBdXo8DTjI=
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6 h1:mfcUKaSOYVDLzuontUOcasesbU9whNnvgrA0qf9trKs=
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4=
kubestash.dev/apimachinery v0.25.0 h1:EgseCFUAoNTi8b7SIPGYywe4CtJhApdMk8IZq01os0U=
kubestash.dev/apimachinery v0.25.0/go.mod h1:SM+G8sUhChP+zSfHvoh/S7P0CIcWvennWv770OFGfNk=
open-cluster-management.io/api v1.2.0 h1:+yeQgJiErrur5S4s205UM37EcZ2XbC9pFSm0xgV5/hU=
open-cluster-management.io/api v1.2.0/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/gateway-api v1.4.0 h1:ZwlNM6zOHq0h3WUX2gfByPs2yAEsy/EenYJB78jpQfQ=
sigs.k8s.io/gateway-api v1.4.0/go.mod h1:AR5RSqciWP98OPckEjOjh2XJhAe2Na4LHyXD2FUY7Qk=
Expand Down
5 changes: 2 additions & 3 deletions vendor/gomodules.xyz/restic/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package restic

import (
"fmt"
"maps"
"os"
"path/filepath"
"sort"
Expand Down Expand Up @@ -234,9 +235,7 @@ func (w *ResticWrapper) Copy() *ResticWrapper {
out.sh = shell.NewSession()

// set values in.sh to out.sh
for k, v := range w.sh.Env {
out.sh.Env[k] = v
}
maps.Copy(out.sh.Env, w.sh.Env)
// don't use same stdin, stdout, stderr for each instant to avoid data race.
// out.sh.Stdin = in.sh.Stdin
// out.sh.Stdout = in.sh.Stdout
Expand Down
9 changes: 7 additions & 2 deletions vendor/gomodules.xyz/restic/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

core "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/klog/v2"
storage "kmodules.xyz/objectstore-api/api/v1"
)

Expand Down Expand Up @@ -131,9 +132,13 @@ func (w *ResticWrapper) exportSecretKey(secret *core.Secret, key string, require
}

func (w *ResticWrapper) setEnvFromSecretIfExists(envs map[string]string, secret *core.Secret, key string, required bool) error {
if required && secret == nil {
return fmt.Errorf("storage Secret is Required")
if secret == nil {
if required {
return fmt.Errorf("key %s is required but storage Secret is not provided", key)
}
return nil
}
klog.Infof("Setting environment variable %s from secret %s\n", key, secret.Name)
v, ok := secret.Data[key]
if !ok {
if required {
Expand Down
2 changes: 1 addition & 1 deletion vendor/gomodules.xyz/restic/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ type SnapshotStats struct {
// ProcessingTime indicates time taken to process the target data
ProcessingTime string `json:"processingTime,omitempty"`
// FileStats shows statistics of files of this snapshot
FileStats FileStats `json:"fileStats,omitempty"`
FileStats FileStats `json:"fileStats"`
}

type FileStats struct {
Expand Down
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ gomodules.xyz/password-generator
# gomodules.xyz/pointer v0.1.0
## explicit; go 1.15
gomodules.xyz/pointer
# gomodules.xyz/restic v0.1.0
# gomodules.xyz/restic v0.2.0
## explicit; go 1.25
gomodules.xyz/restic
# gomodules.xyz/runtime v0.3.0
Expand Down Expand Up @@ -2599,7 +2599,7 @@ kmodules.xyz/prober/api/v1
kmodules.xyz/resource-metadata/apis/node
kmodules.xyz/resource-metadata/apis/node/v1alpha1
kmodules.xyz/resource-metadata/crds
# kubedb.dev/apimachinery v0.61.0
# kubedb.dev/apimachinery v0.62.0
## explicit; go 1.25.0
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/archiver/v1alpha1
Expand Down Expand Up @@ -2650,7 +2650,7 @@ kubedb.dev/apimachinery/pkg/factory
kubedb.dev/apimachinery/pkg/lib
kubedb.dev/apimachinery/pkg/utils
kubedb.dev/apimachinery/pkg/utils/raft
# kubedb.dev/db-client-go v0.16.0
# kubedb.dev/db-client-go v0.17.0
## explicit; go 1.25.5
kubedb.dev/db-client-go/elasticsearch
kubedb.dev/db-client-go/redis
Expand All @@ -2675,13 +2675,13 @@ kubeops.dev/petset/crds
kubeops.dev/sidekick/apis/apps
kubeops.dev/sidekick/apis/apps/v1alpha1
kubeops.dev/sidekick/crds
# kubestash.dev/apimachinery v0.24.0
# kubestash.dev/apimachinery v0.25.0
## explicit; go 1.25.0
kubestash.dev/apimachinery/apis
kubestash.dev/apimachinery/apis/core/v1alpha1
kubestash.dev/apimachinery/apis/storage/v1alpha1
kubestash.dev/apimachinery/crds
# open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6
# open-cluster-management.io/api v1.2.0
## explicit; go 1.25.0
open-cluster-management.io/api/work/v1
# sigs.k8s.io/controller-runtime v0.22.4 => github.com/kmodules/controller-runtime v0.22.5-0.20251227114913-f011264689cd
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/open-cluster-management.io/api/work/v1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading