Merge branch 'master' into cvt-to-aws2

Signed-off-by: Anisur Rahman <anisur@appscode.com>
kubestash · Jan 10, 2025 · d7ea7fd · d7ea7fd
2 parents 921f8df + c6512df
commit d7ea7fd
Show file tree

Hide file tree

Showing 688 changed files with 89,397 additions and 582 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,19 +18,19 @@ jobs:
     name: Build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.23'
 
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Prepare Host
         run: |

diff --git a/.github/workflows/release-tracker.yml b/.github/workflows/release-tracker.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Prepare git
         env:

diff --git a/.github/workflows/update-crds.yml b/.github/workflows/update-crds.yml
@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Set up Go 1.23
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: '1.23'
         id: go
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install GitHub CLI
         run: |

diff --git a/apis/storage/v1alpha1/snapshot_types.go b/apis/storage/v1alpha1/snapshot_types.go
@@ -205,8 +205,32 @@ type Component struct {
 	// VolumeSnapshotterStats specifies the "VolumeSnapshotter" driver specific information
 	// +optional
 	VolumeSnapshotterStats []VolumeSnapshotterStats `json:"volumeSnapshotterStats,omitempty"`
-	// WalSegments specifies a list of wall segment for individual component
-	WalSegments []WalSegment `json:"walSegments,omitempty"`
+
+	LogStats *LogStats `json:"logStats,omitempty"`
+}
+
+type LogStats struct {
+	// Start represents the start time of the first log, that exists in the repository
+	// TODO: Need to update this start time, once the log-retention gets implemented
+	Start *string `json:"start,omitempty"`
+	// End represents the last end time of the log push
+	// Start & End together holds the full time-range. Not individual log.
+	End *string `json:"end,omitempty"`
+	// Lsn for PostgreSQL only
+	// +optional
+	Lsn *string `json:"lsn,omitempty"`
+
+	TotalFailedCount int64 `json:"totalFailedCount,omitempty"`
+	LastFailedStats  []Log `json:"lastFailedStats,omitempty"`
+
+	TotalSucceededCount int64 `json:"totalSucceededCount,omitempty"`
+	LastSucceededStats  []Log `json:"lastSucceededStats,omitempty"`
+}
+
+type Log struct {
+	Start *string `json:"start,omitempty"`
+	End   *string `json:"end,omitempty"`
+	Error string  `json:"error,omitempty"`
 }
 
 // ComponentPhase represents the backup phase of the individual component.
@@ -283,12 +307,6 @@ type WalGStats struct {
 	StopTime *metav1.Time `json:"stopTime,omitempty"`
 }
 
-// WalSegment specifies the "WalG" driver specific information
-type WalSegment struct {
-	Start *metav1.Time `json:"start,omitempty"`
-	End   *metav1.Time `json:"end,omitempty"`
-}
-
 const (
 	TypeSnapshotMetadataUploaded               = "SnapshotMetadataUploaded"
 	ReasonFailedToUploadSnapshotMetadata       = "FailedToUploadSnapshotMetadata"

diff --git a/apis/storage/v1alpha1/zz_generated.deepcopy.go b/apis/storage/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/storage.kubestash.com_snapshots.yaml b/crds/storage.kubestash.com_snapshots.yaml
@@ -99,6 +99,43 @@ spec:
                       type: string
                     integrity:
                       type: boolean
+                    logStats:
+                      properties:
+                        end:
+                          type: string
+                        lastFailedStats:
+                          items:
+                            properties:
+                              end:
+                                type: string
+                              error:
+                                type: string
+                              start:
+                                type: string
+                            type: object
+                          type: array
+                        lastSucceededStats:
+                          items:
+                            properties:
+                              end:
+                                type: string
+                              error:
+                                type: string
+                              start:
+                                type: string
+                            type: object
+                          type: array
+                        lsn:
+                          type: string
+                        start:
+                          type: string
+                        totalFailedCount:
+                          format: int64
+                          type: integer
+                        totalSucceededCount:
+                          format: int64
+                          type: integer
+                      type: object
                     path:
                       type: string
                     phase:
@@ -158,17 +195,6 @@ spec:
                           format: date-time
                           type: string
                       type: object
-                    walSegments:
-                      items:
-                        properties:
-                          end:
-                            format: date-time
-                            type: string
-                          start:
-                            format: date-time
-                            type: string
-                        type: object
-                      type: array
                   type: object
                 type: object
                 x-kubernetes-map-type: granular

diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/google/gofuzz v1.2.0
 	github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
 	github.com/stretchr/testify v1.9.0
+	go.bytebuilders.dev/license-verifier/kubernetes v0.14.4
 	gocloud.dev v0.40.0
 	gomodules.xyz/envsubst v0.2.0
 	gomodules.xyz/go-sh v0.1.0
@@ -23,9 +24,9 @@ require (
 	k8s.io/apimachinery v0.30.2
 	k8s.io/client-go v0.30.2
 	k8s.io/component-base v0.30.2
-	k8s.io/klog/v2 v2.120.1
+	k8s.io/klog/v2 v2.130.1
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
-	kmodules.xyz/client-go v0.30.40
+	kmodules.xyz/client-go v0.30.44
 	kmodules.xyz/crd-schema-fuzz v0.29.1
 	kmodules.xyz/objectstore-api v0.29.1
 	kmodules.xyz/offshoot-api v0.30.1
@@ -48,6 +49,7 @@ require (
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
+	github.com/PuerkitoBio/purell v1.2.1 // indirect
 	github.com/aws/aws-sdk-go v1.55.5 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
@@ -75,6 +77,7 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -92,6 +95,7 @@ require (
 	github.com/google/wire v0.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -113,25 +117,31 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
+	github.com/rancher/rancher/pkg/client v0.0.0-20240710123941-93e332156bbe // indirect
+	github.com/rancher/wrangler/v3 v3.0.0 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.bytebuilders.dev/license-proxyserver v0.0.19 // indirect
+	go.bytebuilders.dev/license-verifier v0.14.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
 	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.22.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -143,12 +153,13 @@ require (
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.30.2 // indirect
 	k8s.io/apiserver v0.30.2 // indirect
+	k8s.io/kube-aggregator v0.30.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
+	kmodules.xyz/apiversion v0.2.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )