Skip to content

Commit 55cd97a

Browse files
authored
Prepare for release v0.23.0 (#171)
ProductLine: Stash Release: v2022.09.29 Release-tracker: stashed/CHANGELOG#56 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent c6df635 commit 55cd97a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+926
-1582
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ require (
2121
k8s.io/klog/v2 v2.80.1
2222
k8s.io/kube-aggregator v0.25.1
2323
k8s.io/kubectl v0.25.1
24-
kmodules.xyz/client-go v0.25.1-0.20220918053236-dd8d8bd7fc37
24+
kmodules.xyz/client-go v0.25.6
2525
kmodules.xyz/objectstore-api v0.25.0
2626
kmodules.xyz/offshoot-api v0.25.0
2727
kmodules.xyz/openshift v0.25.0
28-
stash.appscode.dev/apimachinery v0.22.1-0.20220917042332-522f4e18711d
29-
stash.appscode.dev/stash v0.22.4-0.20220918055805-b0519c8535a1
28+
stash.appscode.dev/apimachinery v0.23.0
29+
stash.appscode.dev/stash v0.23.0
3030
)
3131

3232
require (
@@ -73,7 +73,7 @@ require (
7373
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7474
github.com/josharian/intern v1.0.0 // indirect
7575
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
76-
github.com/mailru/easyjson v0.7.6 // indirect
76+
github.com/mailru/easyjson v0.7.7 // indirect
7777
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7878
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
7979
github.com/mitchellh/mapstructure v1.5.0 // indirect

go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,9 @@ github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN
383383
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
384384
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
385385
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
386-
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
387386
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
387+
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
388+
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
388389
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
389390
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
390391
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -1063,8 +1064,8 @@ k8s.io/kubectl v0.25.1/go.mod h1:ki8ymtGZau2M1lloUV2fqMxP9UCX/i0WIhnWTfqsGSY=
10631064
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
10641065
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsMoD+Izn93E/hm8U=
10651066
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1066-
kmodules.xyz/client-go v0.25.1-0.20220918053236-dd8d8bd7fc37 h1:A8mpj5eD2LGtYbSfHgS8g5FCPiRki7U/gjvsaXsiw5Q=
1067-
kmodules.xyz/client-go v0.25.1-0.20220918053236-dd8d8bd7fc37/go.mod h1:PQAVWlXoHmk/OXqIuUz3xEW5H04uidiLwVyGX0yYnBQ=
1067+
kmodules.xyz/client-go v0.25.6 h1:59mMNoanKrqOFYqDMtqYU5caFxd+7YrfNqpvyKYWqNE=
1068+
kmodules.xyz/client-go v0.25.6/go.mod h1:NgLAVr+IEAFpI9g7FhZF5qG0SG+SBADxknWu5jp0m8M=
10681069
kmodules.xyz/custom-resources v0.25.0 h1:5JQTEuiv6lC/+VVFNKqzfX4YtJCmN5E7mcNtGnHGVQM=
10691070
kmodules.xyz/custom-resources v0.25.0/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
10701071
kmodules.xyz/objectstore-api v0.25.0 h1:xT7+SXBqAMtVkfOdp4espHAfZ6MYUC4G1OgzTkURNnU=
@@ -1095,7 +1096,7 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
10951096
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
10961097
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
10971098
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
1098-
stash.appscode.dev/apimachinery v0.22.1-0.20220917042332-522f4e18711d h1:nGXRD7UTu0B1ifqKeSpcRsA8RPJa6/rGdtiVYUvoIHE=
1099-
stash.appscode.dev/apimachinery v0.22.1-0.20220917042332-522f4e18711d/go.mod h1:f1yvcracYbBFRbabEdX3VFhzgXjOLER2QFvyyBNdeik=
1100-
stash.appscode.dev/stash v0.22.4-0.20220918055805-b0519c8535a1 h1:Mdk/Vkds2DwrGYdHwFExxSrKlhMKR1MTCINXkkCTXE0=
1101-
stash.appscode.dev/stash v0.22.4-0.20220918055805-b0519c8535a1/go.mod h1:DwddyugyM1AKPGpjTqHcrCAN6qsN0L8U13XxbUqdib8=
1099+
stash.appscode.dev/apimachinery v0.23.0 h1:wEOxoVsnF7LtOFxgQyvW+5dlVe8bw6kLhUm2LrQM41s=
1100+
stash.appscode.dev/apimachinery v0.23.0/go.mod h1:Tb1y/+h1r3+YdBvI5RYIC0tW1b8S+0pIb3iG0X7BOjo=
1101+
stash.appscode.dev/stash v0.23.0 h1:CgmcjmCRTztzuY9onWobxQQevkmgC+Wz+OV4epBqVxg=
1102+
stash.appscode.dev/stash v0.23.0/go.mod h1:De3j1rFDCJRik7X1d7G18d+pS1VOTT9FFut8j6uQ6uM=

pkg/delete_snapshot.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,26 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr
8383
if err != nil {
8484
return err
8585
}
86-
// delete from local backend
87-
if repository.Spec.Backend.Local != nil {
88-
r := snapshot.NewREST(cfg)
89-
return r.ForgetSnapshotsFromBackend(repository, []string{snapshotId}, false)
90-
}
9186

9287
// get source repository secret
9388
secret, err := kc.CoreV1().Secrets(namespace).Get(context.TODO(), repository.Spec.Backend.StorageSecretName, metav1.GetOptions{})
9489
if err != nil {
9590
return err
9691
}
9792

93+
opt := snapshot.Options{
94+
Repository: repository,
95+
Secret: secret,
96+
SnapshotIDs: []string{snapshotId},
97+
InCluster: false,
98+
}
99+
100+
// delete from local backend
101+
if repository.Spec.Backend.Local != nil {
102+
r := snapshot.NewREST(cfg)
103+
return r.ForgetSnapshotsFromBackend(opt)
104+
}
105+
98106
if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
99107
return err
100108
}

vendor/github.com/mailru/easyjson/jlexer/lexer.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/client-go/discovery/cached/memory/memcache.go

Lines changed: 0 additions & 243 deletions
This file was deleted.

vendor/kmodules.xyz/client-go/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
5858
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
5959
BASEIMAGE_DBG ?= debian:bullseye
6060

61-
GO_VERSION ?= 1.18
61+
GO_VERSION ?= 1.19
6262
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
6363

6464
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

0 commit comments

Comments
 (0)