Skip to content

Commit 48df32b

Browse files
committed
Prepare for release v0.21.0
ProductLine: KubeStash Release: v2025.12.15 Release-tracker: kubestash/CHANGELOG#36 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 41aa639 commit 48df32b

File tree

30 files changed

+467
-124
lines changed

30 files changed

+467
-124
lines changed

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ require (
1414
gomodules.xyz/pointer v0.1.0
1515
gomodules.xyz/runtime v0.3.0
1616
gomodules.xyz/x v0.0.17
17-
k8s.io/api v0.32.3
18-
k8s.io/apimachinery v0.32.3
17+
k8s.io/api v0.32.8
18+
k8s.io/apimachinery v0.32.8
1919
k8s.io/cli-runtime v0.32.2
20-
k8s.io/client-go v0.32.3
20+
k8s.io/client-go v0.32.8
2121
k8s.io/klog/v2 v2.130.1
2222
k8s.io/kubectl v0.30.1
2323
k8s.io/utils v0.0.0-20241210054802-24370beab758
24-
kmodules.xyz/client-go v0.32.10
24+
kmodules.xyz/client-go v0.32.11
2525
kmodules.xyz/offshoot-api v0.32.0
2626
kmodules.xyz/prober v0.32.0
2727
kubedb.dev/apimachinery v0.59.0
28-
kubestash.dev/apimachinery v0.22.0-rc.0
28+
kubestash.dev/apimachinery v0.22.0
2929
sigs.k8s.io/controller-runtime v0.20.4
3030
sigs.k8s.io/yaml v1.4.0
3131
stash.appscode.dev/apimachinery v0.41.0
@@ -195,16 +195,16 @@ require (
195195
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
196196
gopkg.in/inf.v0 v0.9.1 // indirect
197197
gopkg.in/yaml.v3 v3.0.1 // indirect
198-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
199-
k8s.io/apiserver v0.32.3 // indirect
200-
k8s.io/component-base v0.32.3 // indirect
198+
k8s.io/apiextensions-apiserver v0.32.8 // indirect
199+
k8s.io/apiserver v0.32.8 // indirect
200+
k8s.io/component-base v0.32.8 // indirect
201201
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
202202
kmodules.xyz/apiversion v0.2.0 // indirect
203203
kmodules.xyz/custom-resources v0.32.2 // indirect
204204
kmodules.xyz/monitoring-agent-api v0.32.4 // indirect
205205
kmodules.xyz/objectstore-api v0.32.2 // indirect
206-
kubeops.dev/petset v0.0.12 // indirect
207-
kubeops.dev/sidekick v0.0.11 // indirect
206+
kubeops.dev/petset v0.0.15 // indirect
207+
kubeops.dev/sidekick v0.0.12 // indirect
208208
open-cluster-management.io/api v1.0.0 // indirect
209209
sigs.k8s.io/gateway-api v1.1.0 // indirect
210210
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -841,18 +841,18 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
841841
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
842842
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
843843
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
844-
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
845-
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
846-
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=
847-
k8s.io/apiextensions-apiserver v0.32.3/go.mod h1:8YwcvVRMVzw0r1Stc7XfGAzB/SIVLunqApySV5V7Dss=
848-
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
849-
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
844+
k8s.io/api v0.32.8 h1:PhuKPnqsaXYuwmLXRLAmdDJ9EZ2R2kEbOZTq4UE3lGc=
845+
k8s.io/api v0.32.8/go.mod h1:gdRZQ4zXGawr9YrJ5OjTl7aR3TD0mTowtFsqFtpCDXo=
846+
k8s.io/apiextensions-apiserver v0.32.8 h1:iYIIaZmn/BMTwzGYRZnYZysaKB4t2TL3O+0yhmbXE2U=
847+
k8s.io/apiextensions-apiserver v0.32.8/go.mod h1:GTGskWgcBo/7boX33zcS8JY6vaG4s728AdbQPxtheVk=
848+
k8s.io/apimachinery v0.32.8 h1:95I+2jX71Tev+C+UlhNbmKfv+A/TQII42HLskiHZpBg=
849+
k8s.io/apimachinery v0.32.8/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
850850
k8s.io/cli-runtime v0.32.2 h1:aKQR4foh9qeyckKRkNXUccP9moxzffyndZAvr+IXMks=
851851
k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8=
852-
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
853-
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
854-
k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k=
855-
k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI=
852+
k8s.io/client-go v0.32.8 h1:BkSFWUtRz/BbE3DJF98KPg7ix6lwMnIQ9DnHw3iWiSw=
853+
k8s.io/client-go v0.32.8/go.mod h1:vGkCzRxZ7BuRX2zdW7+kOwCdcgOkq9omDWb26wk/sE0=
854+
k8s.io/component-base v0.32.8 h1:Ez5yxl4Apas9m0gUQfwD60GbMyhfHPbvaYzQkpBDE6k=
855+
k8s.io/component-base v0.32.8/go.mod h1:zrTYhjPNFrItmyFEPiRIL9pgZa4jIgOUyOwrEL7xb10=
856856
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
857857
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
858858
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
@@ -864,8 +864,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
864864
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
865865
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
866866
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
867-
kmodules.xyz/client-go v0.32.10 h1:O/UKeU6Xc4scQG80DYw1HI8DYskyp1KsCEShIx3+T54=
868-
kmodules.xyz/client-go v0.32.10/go.mod h1:4k+da95l/Idg7k0+qc5qZCJJoAF6IQK5x0Fa+hBVD+Q=
867+
kmodules.xyz/client-go v0.32.11 h1:AbvsutYyCfCGgreMOx5ghdZto0ltKfhS/6n98TkXTGc=
868+
kmodules.xyz/client-go v0.32.11/go.mod h1:4k+da95l/Idg7k0+qc5qZCJJoAF6IQK5x0Fa+hBVD+Q=
869869
kmodules.xyz/custom-resources v0.32.2 h1:NkRqL/4AWHiXdT5WKFcJlBcvRuoNdeYIrBGvQIRJRn4=
870870
kmodules.xyz/custom-resources v0.32.2/go.mod h1:YKFNcsFQU7Z3AcPvYVCdFtgAdWiG1Wd1HQMOxCrAoWc=
871871
kmodules.xyz/monitoring-agent-api v0.32.4 h1:JGm2bvHfAXHAf7EKjFrNDG3f7+QFpYV2Mvgj3RDVRhw=
@@ -878,12 +878,12 @@ kmodules.xyz/prober v0.32.0 h1:8Z6pFRAu8kP0wwX2BooPCRy2SE6ZkUMHQmZDH5VUEGY=
878878
kmodules.xyz/prober v0.32.0/go.mod h1:h0fH4m9DaIwuNZq85zOlWUvBycyy4LvCPMUUhpS3iSE=
879879
kubedb.dev/apimachinery v0.59.0 h1:6daQ4dS6xayoyaZ67N5NXxOD1wH4H7v5JKPSwjPDbAk=
880880
kubedb.dev/apimachinery v0.59.0/go.mod h1:cdAy0z4ED/iunIQprmaB4yCSxgBkFaT5fcOT/ogxl0Q=
881-
kubeops.dev/petset v0.0.12 h1:NSFEeuckBVm44f3cAL4HhcQWvnfOE4qgbfug7+FEyaY=
882-
kubeops.dev/petset v0.0.12/go.mod h1:akG9QH1JaOZQcuQKEKWvkVWI8P3im/5O554aTRvB6Y0=
883-
kubeops.dev/sidekick v0.0.11 h1:OydXdIH6cYSiWxKIWvrywk95WhhHSERkc7RNPOmTekc=
884-
kubeops.dev/sidekick v0.0.11/go.mod h1:90KMNmJOPoMKHbrdC1cpEsMx+1KjTea/lHDAbGRDzHc=
885-
kubestash.dev/apimachinery v0.22.0-rc.0 h1:PWDWnRhntcBk4Tv3+aBxKst3Axwm2lCV8nugZI20Hew=
886-
kubestash.dev/apimachinery v0.22.0-rc.0/go.mod h1:AgVLaTQX/MZ8GETMf3JuyfCsKy0wc1jPWVp4hUm2ywM=
881+
kubeops.dev/petset v0.0.15 h1:iwTRFAp0RNw0A87sw2c97UZ6WIA9H/nhJBpDhXLa7fk=
882+
kubeops.dev/petset v0.0.15/go.mod h1:sw96WiXfzhpmKpXj4a5AdmEHs0Bx4QMhf+iW15zY4Gg=
883+
kubeops.dev/sidekick v0.0.12 h1:pmUjQLZDKxgREiM6z0PogLR1aDbgvkE9jRjbxG6dEt0=
884+
kubeops.dev/sidekick v0.0.12/go.mod h1:RU7QH3E8DOLw15rBYlOOJSyczuwAnVVtYyZjJb00UB8=
885+
kubestash.dev/apimachinery v0.22.0 h1:vp3Z7ISU2WYR6LkU7WLjbiCMSZQEjfzANN/C1cZ7L+s=
886+
kubestash.dev/apimachinery v0.22.0/go.mod h1:c6d5CNgG3ScLB/EdCZcFx8gAY/aY8KkLTfMFy0cobQM=
887887
open-cluster-management.io/api v1.0.0 h1:54QllH9DTudCk6VrGt0q8CDsE3MghqJeTaTN4RHZpE0=
888888
open-cluster-management.io/api v1.0.0/go.mod h1:/OeqXycNBZQoe3WG6ghuWsMgsKGuMZrK8ZpsU6gWL0Y=
889889
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
version: "2"
2+
linters:
3+
default: standard
4+
enable:
5+
- unparam
6+
7+
formatters:
8+
enable:
9+
- gofmt
10+
- goimports
11+
settings:
12+
gofmt:
13+
rewrite-rules:
14+
- pattern: 'interface{}'
15+
replacement: 'any'
16+
17+
issues:
18+
max-same-issues: 100
19+
20+
exclude-files:
21+
- generated.*\\.go
22+
23+
exclude-dirs:
24+
- vendor
25+
26+
run:
27+
timeout: 10m

vendor/kmodules.xyz/client-go/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ test: $(BUILD_DIRS)
242242
./hack/test.sh $(SRC_PKGS) \
243243
"
244244

245-
ADDTL_LINTERS := gofmt,goimports,unparam
246-
247245
.PHONY: lint
248246
lint: $(BUILD_DIRS)
249247
@echo "running linter"
@@ -261,7 +259,7 @@ lint: $(BUILD_DIRS)
261259
--env GO111MODULE=on \
262260
--env GOFLAGS="-mod=vendor" \
263261
$(BUILD_IMAGE) \
264-
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
262+
golangci-lint run
265263

266264
$(BUILD_DIRS):
267265
@mkdir -p $@

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ func MustParseObjectID(key OID) *ObjectID {
158158
return oid
159159
}
160160

161-
func ObjectIDMap(key OID) (map[string]interface{}, error) {
162-
id := map[string]interface{}{
161+
func ObjectIDMap(key OID) (map[string]any, error) {
162+
id := map[string]any{
163163
"group": "",
164164
"kind": "",
165165
"namespace": "",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (t TimeOfDay) MarshalJSON() ([]byte, error) {
164164
}
165165

166166
// ToUnstructured implements the value.UnstructuredConverter interface.
167-
func (t TimeOfDay) ToUnstructured() interface{} {
167+
func (t TimeOfDay) ToUnstructured() any {
168168
if t.IsZero() {
169169
return nil
170170
}
@@ -177,11 +177,11 @@ func (t TimeOfDay) ToUnstructured() interface{} {
177177
// the OpenAPI spec of this type.
178178
//
179179
// See: https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators
180-
func (_ TimeOfDay) OpenAPISchemaType() []string { return []string{"string"} }
180+
func (TimeOfDay) OpenAPISchemaType() []string { return []string{"string"} }
181181

182182
// OpenAPISchemaFormat is used by the kube-openapi generator when constructing
183183
// the OpenAPI spec of this type.
184-
func (_ TimeOfDay) OpenAPISchemaFormat() string { return "time" }
184+
func (TimeOfDay) OpenAPISchemaFormat() string { return "time" }
185185

186186
// MarshalQueryParameter converts to a URL query parameter value
187187
func (t TimeOfDay) MarshalQueryParameter() (string, error) {
@@ -201,7 +201,7 @@ func (t *TimeOfDay) Fuzz(c fuzz.Continue) {
201201
// Allow for about 1000 years of randomness. Leave off nanoseconds
202202
// because JSON doesn't represent them so they can't round-trip
203203
// properly.
204-
t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0)
204+
t.Time = time.Unix(c.Int63n(1000*365*24*60*60), 0)
205205
}
206206

207207
// ensure Time implements fuzz.Interface

vendor/kmodules.xyz/client-go/conditions/getter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func mirror(from Getter, targetCondition kmapi.ConditionType, options ...MirrorO
223223
case true:
224224
condition = TrueCondition(targetCondition)
225225
case false:
226-
condition = FalseCondition(targetCondition, mirrorOpt.fallbackReason, mirrorOpt.fallbackSeverity, mirrorOpt.fallbackMessage) //nolint:govet
226+
condition = FalseCondition(targetCondition, mirrorOpt.fallbackReason, mirrorOpt.fallbackSeverity, "%s", mirrorOpt.fallbackMessage)
227227
}
228228
}
229229

vendor/kmodules.xyz/client-go/conditions/matcher.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ type matchConditions struct {
3636
expected kmapi.Conditions
3737
}
3838

39-
func (m matchConditions) Match(actual interface{}) (success bool, err error) {
40-
elems := []interface{}{}
39+
func (m matchConditions) Match(actual any) (success bool, err error) {
40+
elems := []any{}
4141
for _, condition := range m.expected {
4242
elems = append(elems, MatchCondition(condition))
4343
}
4444

4545
return gomega.ConsistOf(elems).Match(actual)
4646
}
4747

48-
func (m matchConditions) FailureMessage(actual interface{}) (message string) {
48+
func (m matchConditions) FailureMessage(actual any) (message string) {
4949
return fmt.Sprintf("expected\n\t%#v\nto match\n\t%#v\n", actual, m.expected)
5050
}
5151

52-
func (m matchConditions) NegatedFailureMessage(actual interface{}) (message string) {
52+
func (m matchConditions) NegatedFailureMessage(actual any) (message string) {
5353
return fmt.Sprintf("expected\n\t%#v\nto not match\n\t%#v\n", actual, m.expected)
5454
}
5555

@@ -64,7 +64,7 @@ type matchCondition struct {
6464
expected kmapi.Condition
6565
}
6666

67-
func (m matchCondition) Match(actual interface{}) (success bool, err error) {
67+
func (m matchCondition) Match(actual any) (success bool, err error) {
6868
actualCondition, ok := actual.(kmapi.Condition)
6969
if !ok {
7070
return false, fmt.Errorf("actual should be of type Condition")
@@ -94,10 +94,10 @@ func (m matchCondition) Match(actual interface{}) (success bool, err error) {
9494
return ok, err
9595
}
9696

97-
func (m matchCondition) FailureMessage(actual interface{}) (message string) {
97+
func (m matchCondition) FailureMessage(actual any) (message string) {
9898
return fmt.Sprintf("expected\n\t%#v\nto match\n\t%#v\n", actual, m.expected)
9999
}
100100

101-
func (m matchCondition) NegatedFailureMessage(actual interface{}) (message string) {
101+
func (m matchCondition) NegatedFailureMessage(actual any) (message string) {
102102
return fmt.Sprintf("expected\n\t%#v\nto not match\n\t%#v\n", actual, m.expected)
103103
}

vendor/kmodules.xyz/client-go/conditions/matchers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type conditionMatcher struct {
3636
Expected *kmapi.Condition
3737
}
3838

39-
func (matcher *conditionMatcher) Match(actual interface{}) (success bool, err error) {
39+
func (matcher *conditionMatcher) Match(actual any) (success bool, err error) {
4040
actualCondition, ok := actual.(*kmapi.Condition)
4141
if !ok {
4242
return false, errors.New("value should be a condition")
@@ -45,10 +45,10 @@ func (matcher *conditionMatcher) Match(actual interface{}) (success bool, err er
4545
return hasSameState(actualCondition, matcher.Expected), nil
4646
}
4747

48-
func (matcher *conditionMatcher) FailureMessage(actual interface{}) (message string) {
48+
func (matcher *conditionMatcher) FailureMessage(actual any) (message string) {
4949
return format.Message(actual, "to have the same state of", matcher.Expected)
5050
}
5151

52-
func (matcher *conditionMatcher) NegatedFailureMessage(actual interface{}) (message string) {
52+
func (matcher *conditionMatcher) NegatedFailureMessage(actual any) (message string) {
5353
return format.Message(actual, "not to have the same state of", matcher.Expected)
5454
}

vendor/kmodules.xyz/client-go/conditions/merge.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type localizedCondition struct {
3232
}
3333

3434
// merge a list of condition into a single one.
35-
// This operation is designed to ensure visibility of the most relevant util for defining the
35+
// This operation is designed to ensure visibility of the most relevant conditions for defining the
3636
// operational state of a component. E.g. If there is one error in the condition list, this one takes
37-
// priority over the other util, and it should be reflected in the target condition.
37+
// priority over the other conditions and it is should be reflected in the target condition.
3838
//
3939
// More specifically:
4040
// 1. Conditions are grouped by status, severity
@@ -63,11 +63,10 @@ func merge(conditions []localizedCondition, targetCondition kmapi.ConditionType,
6363

6464
targetReason := getReason(g, options)
6565
targetMessage := getMessage(g, options)
66-
6766
if g.TopGroup().status == metav1.ConditionFalse {
68-
return FalseCondition(targetCondition, targetReason, g.TopGroup().severity, targetMessage) //nolint:govet
67+
return FalseCondition(targetCondition, targetReason, g.TopGroup().severity, "%s", targetMessage)
6968
}
70-
return UnknownCondition(targetCondition, targetReason, targetMessage) //nolint:govet
69+
return UnknownCondition(targetCondition, targetReason, "%s", targetMessage)
7170
}
7271

7372
// getConditionGroups groups a list of conditions according to status, severity values.

0 commit comments

Comments
 (0)