Skip to content

Commit e9ef106

Browse files
1gtm1gtm
authored
Prepare for release v0.33.0-rc.0 (#194)
ProductLine: Stash Release: v2024.2.9-rc.0 Release-tracker: stashed/CHANGELOG#70 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 6bfaa69 commit e9ef106

File tree

7 files changed

+31
-27
lines changed

7 files changed

+31
-27
lines changed

‎go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
kmodules.xyz/offshoot-api v0.29.0
2828
kmodules.xyz/openshift v0.29.0
2929
sigs.k8s.io/yaml v1.4.0
30-
stash.appscode.dev/apimachinery v0.32.1-0.20240209175028-1fb8e3376f2c
31-
stash.appscode.dev/stash v0.32.0
30+
stash.appscode.dev/apimachinery v0.33.0-rc.0
31+
stash.appscode.dev/stash v0.33.0-rc.0
3232
)
3333

3434
require (
@@ -62,7 +62,6 @@ require (
6262
github.com/google/gnostic-models v0.6.8 // indirect
6363
github.com/google/go-cmp v0.6.0 // indirect
6464
github.com/google/gofuzz v1.2.0 // indirect
65-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
6665
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6766
github.com/google/uuid v1.4.0 // indirect
6867
github.com/gorilla/websocket v1.5.0 // indirect
@@ -72,7 +71,6 @@ require (
7271
github.com/josharian/intern v1.0.0 // indirect
7372
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
7473
github.com/mailru/easyjson v0.7.7 // indirect
75-
github.com/mattn/go-isatty v0.0.18 // indirect
7674
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
7775
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
7876
github.com/mitchellh/mapstructure v1.5.0 // indirect

‎go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
558558
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
559559
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
560560
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
561-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
562561
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
563562
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
564563
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -772,7 +771,7 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
772771
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
773772
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
774773
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
775-
stash.appscode.dev/apimachinery v0.32.1-0.20240209175028-1fb8e3376f2c h1:swyyQ3GXY7/DkOCCPe9s8FO4+g8/D47eCwDZyOyAOC0=
776-
stash.appscode.dev/apimachinery v0.32.1-0.20240209175028-1fb8e3376f2c/go.mod h1:E+mbh2FR1oKyP7WQS5W3MzOrZ3iZUSvrzSCCJPa8qRc=
777-
stash.appscode.dev/stash v0.32.0 h1:w13RjTBSJssP2DLkSIihPzzMo3xJfCKxYvPDb0J3BH8=
778-
stash.appscode.dev/stash v0.32.0/go.mod h1:h+Ab0IgTCW9XmyoHfkLogtbFzO7ACulXQdJgqYgL/ww=
774+
stash.appscode.dev/apimachinery v0.33.0-rc.0 h1:yfLn3YYgfo12pTI8oOZBswkQpzFt4MzPaIaoZ2Nok64=
775+
stash.appscode.dev/apimachinery v0.33.0-rc.0/go.mod h1:M51wIqUONZ7cmx/h5W+Lp+/TlYAF8z7+kQJPsvtl7G4=
776+
stash.appscode.dev/stash v0.33.0-rc.0 h1:Qk24wtrZNsf913GQlQqv5KFZZO/EroYqr3Ua3AtPbY4=
777+
stash.appscode.dev/stash v0.33.0-rc.0/go.mod h1:XZRokyb8a6RUJfW7v2i3o9DSUbnJHg9iZLLL59kyLvo=

‎vendor/modules.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ github.com/google/go-cmp/cmp/internal/value
113113
## explicit; go 1.12
114114
github.com/google/gofuzz
115115
github.com/google/gofuzz/bytesource
116-
# github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26
117-
## explicit; go 1.18
118116
# github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
119117
## explicit; go 1.13
120118
github.com/google/shlex
@@ -155,8 +153,6 @@ github.com/liggitt/tabwriter
155153
github.com/mailru/easyjson/buffer
156154
github.com/mailru/easyjson/jlexer
157155
github.com/mailru/easyjson/jwriter
158-
# github.com/mattn/go-isatty v0.0.18
159-
## explicit; go 1.15
160156
# github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0
161157
## explicit; go 1.19
162158
github.com/matttproud/golang_protobuf_extensions/v2/pbutil
@@ -1017,8 +1013,8 @@ sigs.k8s.io/structured-merge-diff/v4/value
10171013
## explicit; go 1.12
10181014
sigs.k8s.io/yaml
10191015
sigs.k8s.io/yaml/goyaml.v2
1020-
# stash.appscode.dev/apimachinery v0.32.1-0.20240209175028-1fb8e3376f2c
1021-
## explicit; go 1.21.6
1016+
# stash.appscode.dev/apimachinery v0.33.0-rc.0
1017+
## explicit; go 1.21.5
10221018
stash.appscode.dev/apimachinery/apis
10231019
stash.appscode.dev/apimachinery/apis/repositories
10241020
stash.appscode.dev/apimachinery/apis/repositories/v1alpha1
@@ -1046,8 +1042,8 @@ stash.appscode.dev/apimachinery/pkg/docker
10461042
stash.appscode.dev/apimachinery/pkg/invoker
10471043
stash.appscode.dev/apimachinery/pkg/metrics
10481044
stash.appscode.dev/apimachinery/pkg/restic
1049-
# stash.appscode.dev/stash v0.32.0
1050-
## explicit; go 1.18
1045+
# stash.appscode.dev/stash v0.33.0-rc.0
1046+
## explicit; go 1.21.7
10511047
stash.appscode.dev/stash/pkg/registry/snapshot
10521048
stash.appscode.dev/stash/pkg/util
10531049
# github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8

‎vendor/stash.appscode.dev/stash/pkg/registry/snapshot/snapshot.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package snapshot
1818

1919
import (
2020
"context"
21+
"strings"
2122

2223
"stash.appscode.dev/apimachinery/apis/repositories"
2324
repov1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1"
@@ -60,6 +61,7 @@ var (
6061
_ rest.GracefulDeleter = &REST{}
6162
_ rest.GroupVersionKindProvider = &REST{}
6263
_ rest.CategoriesProvider = &REST{}
64+
_ rest.SingularNameProvider = &REST{}
6365
)
6466

6567
func NewREST(config *restconfig.Config) *REST {
@@ -92,6 +94,10 @@ func (r *REST) Categories() []string {
9294
return []string{"storage", "appscode", "all"}
9395
}
9496

97+
func (r *REST) GetSingularName() string {
98+
return strings.ToLower(repov1alpha1.ResourceKindSnapshot)
99+
}
100+
95101
func (r *REST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
96102
ns, ok := apirequest.NamespaceFrom(ctx)
97103
if !ok {

‎vendor/stash.appscode.dev/stash/pkg/util/crds.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ func updateStatusFunction(image docker.Docker) *api_v1beta1.Function {
100100
"--provider=${REPOSITORY_PROVIDER:=}",
101101
"--bucket=${REPOSITORY_BUCKET:=}",
102102
"--endpoint=${REPOSITORY_ENDPOINT:=}",
103+
"--insecure-tls=${REPOSITORY_INSECURE_TLS:=}",
103104
"--region=${REPOSITORY_REGION:=}",
104105
"--path=${REPOSITORY_PREFIX:=}",
105106
"--enable-cache=${ENABLE_CACHE:=true}",
@@ -134,6 +135,7 @@ func pvcBackupFunction(image docker.Docker) *api_v1beta1.Function {
134135
"--provider=${REPOSITORY_PROVIDER:=}",
135136
"--bucket=${REPOSITORY_BUCKET:=}",
136137
"--endpoint=${REPOSITORY_ENDPOINT:=}",
138+
"--insecure-tls=${REPOSITORY_INSECURE_TLS:=}",
137139
"--region=${REPOSITORY_REGION:=}",
138140
"--path=${REPOSITORY_PREFIX:=}",
139141
"--enable-cache=${ENABLE_CACHE:=true}",
@@ -184,6 +186,7 @@ func pvcRestoreFunction(image docker.Docker) *api_v1beta1.Function {
184186
"--provider=${REPOSITORY_PROVIDER:=}",
185187
"--bucket=${REPOSITORY_BUCKET:=}",
186188
"--endpoint=${REPOSITORY_ENDPOINT:=}",
189+
"--insecure-tls=${REPOSITORY_INSECURE_TLS:=}",
187190
"--region=${REPOSITORY_REGION:=}",
188191
"--path=${REPOSITORY_PREFIX:=}",
189192
"--enable-cache=${ENABLE_CACHE:=true}",

‎vendor/stash.appscode.dev/stash/pkg/util/kubernetes.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,44 +238,44 @@ func DeleteAllConfigMapLocks(k8sClient kubernetes.Interface, namespace, name, ki
238238
}
239239

240240
func WaitUntilDeploymentReady(c kubernetes.Interface, meta metav1.ObjectMeta) error {
241-
return wait.PollImmediate(apis.RetryInterval, apis.ReadinessTimeout, func() (bool, error) {
242-
if obj, err := c.AppsV1().Deployments(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{}); err == nil {
241+
return wait.PollUntilContextTimeout(context.Background(), apis.RetryInterval, apis.ReadinessTimeout, true, func(ctx context.Context) (bool, error) {
242+
if obj, err := c.AppsV1().Deployments(meta.Namespace).Get(ctx, meta.Name, metav1.GetOptions{}); err == nil {
243243
return pointer.Int32(obj.Spec.Replicas) == obj.Status.ReadyReplicas && obj.ObjectMeta.Generation == obj.Status.ObservedGeneration, nil
244244
}
245245
return false, nil
246246
})
247247
}
248248

249249
func WaitUntilDaemonSetReady(kubeClient kubernetes.Interface, meta metav1.ObjectMeta) error {
250-
return wait.PollImmediate(apis.RetryInterval, apis.ReadinessTimeout, func() (bool, error) {
251-
if obj, err := kubeClient.AppsV1().DaemonSets(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{}); err == nil {
250+
return wait.PollUntilContextTimeout(context.Background(), apis.RetryInterval, apis.ReadinessTimeout, true, func(ctx context.Context) (bool, error) {
251+
if obj, err := kubeClient.AppsV1().DaemonSets(meta.Namespace).Get(ctx, meta.Name, metav1.GetOptions{}); err == nil {
252252
return obj.Status.DesiredNumberScheduled == obj.Status.NumberReady && obj.ObjectMeta.Generation == obj.Status.ObservedGeneration, nil
253253
}
254254
return false, nil
255255
})
256256
}
257257

258258
func WaitUntilStatefulSetReady(kubeClient kubernetes.Interface, meta metav1.ObjectMeta) error {
259-
return wait.PollImmediate(apis.RetryInterval, apis.ReadinessTimeout, func() (bool, error) {
260-
if obj, err := kubeClient.AppsV1().StatefulSets(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{}); err == nil {
259+
return wait.PollUntilContextTimeout(context.Background(), apis.RetryInterval, apis.ReadinessTimeout, true, func(ctx context.Context) (bool, error) {
260+
if obj, err := kubeClient.AppsV1().StatefulSets(meta.Namespace).Get(ctx, meta.Name, metav1.GetOptions{}); err == nil {
261261
return pointer.Int32(obj.Spec.Replicas) == obj.Status.ReadyReplicas && obj.ObjectMeta.Generation == obj.Status.ObservedGeneration, nil
262262
}
263263
return false, nil
264264
})
265265
}
266266

267267
func WaitUntilDeploymentConfigReady(c oc_cs.Interface, meta metav1.ObjectMeta) error {
268-
return wait.PollImmediate(apis.RetryInterval, apis.ReadinessTimeout, func() (bool, error) {
269-
if obj, err := c.AppsV1().DeploymentConfigs(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{}); err == nil {
268+
return wait.PollUntilContextTimeout(context.Background(), apis.RetryInterval, apis.ReadinessTimeout, true, func(ctx context.Context) (bool, error) {
269+
if obj, err := c.AppsV1().DeploymentConfigs(meta.Namespace).Get(ctx, meta.Name, metav1.GetOptions{}); err == nil {
270270
return obj.Spec.Replicas == obj.Status.ReadyReplicas && obj.ObjectMeta.Generation == obj.Status.ObservedGeneration, nil
271271
}
272272
return false, nil
273273
})
274274
}
275275

276276
func WaitUntilPVCReady(c kubernetes.Interface, meta metav1.ObjectMeta) error {
277-
return wait.PollImmediate(apis.RetryInterval, 2*time.Hour, func() (bool, error) {
278-
if obj, err := c.CoreV1().PersistentVolumeClaims(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{}); err == nil {
277+
return wait.PollUntilContextTimeout(context.Background(), apis.RetryInterval, 2*time.Hour, true, func(ctx context.Context) (bool, error) {
278+
if obj, err := c.CoreV1().PersistentVolumeClaims(meta.Namespace).Get(ctx, meta.Name, metav1.GetOptions{}); err == nil {
279279
return obj.Status.Phase == core.ClaimBound, nil
280280
}
281281
return false, nil

‎vendor/stash.appscode.dev/stash/pkg/util/options.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,15 @@ func SetupOptionsForRepository(repository api_v1alpha1.Repository, extraOpt Extr
9595
}
9696
endpoint, _ := repository.Spec.Backend.Endpoint()
9797
region, _ := repository.Spec.Backend.Region()
98+
insecureTLS := repository.Spec.Backend.InsecureTLS()
9899

99100
return restic.SetupOptions{
100101
Provider: provider,
101102
Bucket: bucket,
102103
Path: prefix,
103104
Endpoint: endpoint,
104105
Region: region,
106+
InsecureTLS: insecureTLS,
105107
CacertFile: extraOpt.CacertFile,
106108
StorageSecret: extraOpt.StorageSecret,
107109
ScratchDir: extraOpt.ScratchDir,

0 commit comments

Comments
 (0)