Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging changes from 1.2.13 to master #381

Merged
merged 9 commits into from
Jun 17, 2024
+57,177 −25,586
Merged

Merging changes from 1.2.13 to master #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5444f9
PB-6205: Adding support for upload of resources to BL and restore in …
kgarg-px Mar 29, 2024
e242a6c
PB-6205: Vendor changes from stork
kgarg-px Apr 15, 2024
57973d1
pxb-2.7.2: Vendor changes from stork pxb-2.7.2
kgarg-px May 20, 2024
c755b2d
vendor latest stork from pxb-2.7.2 branch
May 21, 2024
8461dc1
Makefile and travis file changes for 1.2.13 version
prashanthpx May 27, 2024
4569647
PB-7215 : Update Kopia binary with 0.16.0 tag and SSE changes
vikasit12 Jun 6, 2024
2187ce6
pb-6681: Add support for PSA in kdmp job
lalat-das May 15, 2024
d015322
pb-7265: Enable job status to check for pod security violation
lalat-das Jun 14, 2024
dbe930c
vendor stork pxb-2.7.2 to kdmp 1.2.13
lalat-das Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ script:
- |
if [ -n "${TRAVIS_TAG}" ]; then
export RELEASE_VER=${TRAVIS_TAG}
elif [ "${TRAVIS_BRANCH}" == "master" ]; then
export DOCKER_IMAGE_TAG=master-latest
elif [ "${TRAVIS_BRANCH}" == "1.2.13" ]; then
export DOCKER_IMAGE_TAG=1.2.13
else
export RELEASE_VER=`git rev-parse --short HEAD`
fi
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DOCKER_IMAGE_NAME?=kdmp
DOCKER_IMAGE_TAG?=$(RELEASE_VER)

DOCKER_KDMP_UNITTEST_IMAGE?=px-kdmp-unittest
DOCKER_KDMP_TAG?=1.2.11
DOCKER_KDMP_TAG?=1.2.13

DOCKER_IMAGE=$(DOCKER_IMAGE_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
KDMP_UNITTEST_IMG=$(DOCKER_IMAGE_REPO)/$(DOCKER_KDMP_UNITTEST_IMAGE):$(DOCKER_KDMP_TAG)
Expand Down
Binary file modified bin/kopia
View file
Open in desktop
Binary file not shown.
50 changes: 29 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc7
github.com/libopenstorage/stork v1.4.1-0.20240513102605-2340238c7664
github.com/libopenstorage/stork v1.4.1-0.20240616131748-2d789e95dcdb
github.com/portworx/pxc v0.33.0
github.com/portworx/sched-ops v1.20.4-rc1.0.20240424153814-f3083bdb4578
github.com/portworx/sched-ops v1.20.4-rc1.0.20240514213912-ff0ae32b859a
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
github.com/urfave/cli v1.22.12
gocloud.dev v0.20.0
k8s.io/api v0.27.1
k8s.io/apiextensions-apiserver v0.26.5
k8s.io/apimachinery v0.29.0
gocloud.dev v0.22.0
k8s.io/api v0.29.3
k8s.io/apiextensions-apiserver v0.28.4
k8s.io/apimachinery v0.29.3
k8s.io/cli-runtime v0.25.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.26.5
k8s.io/component-helpers v0.25.1
k8s.io/kubectl v0.25.2
k8s.io/kubernetes v1.25.1
k8s.io/utils v0.0.0-20230505201702-9f6742963106
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.14.5
)

Expand All @@ -38,7 +38,11 @@ require (
cloud.google.com/go/storage v1.30.1 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/azure-storage-blob-go v0.14.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
Expand All @@ -50,6 +54,7 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand All @@ -67,7 +72,7 @@ require (
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
Expand All @@ -83,10 +88,11 @@ require (
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
Expand All @@ -96,7 +102,6 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/google/wire v0.4.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
Expand All @@ -114,6 +119,7 @@ require (
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20191119172530-79f836b90111 // indirect
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0 // indirect
github.com/kubernetes-sigs/aws-ebs-csi-driver v0.9.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/libopenstorage/gossip v0.0.0-20220309192431-44c895e0923e // indirect
github.com/libopenstorage/openstorage v9.4.47+incompatible // indirect
github.com/libopenstorage/openstorage-sdk-clients v0.109.0 // indirect
Expand All @@ -137,14 +143,15 @@ require (
github.com/openshift/custom-resource-status v1.1.2 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/portworx/kvdb v0.0.0-20230326003017-21a38cf82d4b // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_golang v1.15.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rancher/norman v0.0.0-20230222213531-275a3e921940 // indirect
github.com/rancher/rancher/pkg/client v0.0.0-20230203155537-a67566517525 // indirect
github.com/rancher/wrangler v1.1.0 // indirect
Expand Down Expand Up @@ -177,17 +184,17 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.26.2 // indirect
k8s.io/component-base v0.26.2 // indirect
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
kubevirt.io/api v1.0.0 // indirect
kubevirt.io/client-go v0.59.2 // indirect
kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 // indirect
Expand All @@ -197,12 +204,12 @@ require (
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
github.com/Azure/azure-storage-blob-go => github.com/Azure/azure-storage-blob-go v0.9.0
github.com/Azure/azure-storage-blob-go => github.com/Azure/azure-storage-blob-go v0.15.0
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
github.com/kubernetes-csi/external-snapshotter/v2 => github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1
github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v0.20.4-openstorage-rc10
Expand All @@ -229,6 +236,7 @@ replace (
k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
k8s.io/kubectl => k8s.io/kubectl v0.25.0
Expand Down
Loading
Loading