Merge pull request #531 from deepakkinni/xport-7

Cherry-pick #528, #529 and #530

Dockerfile-backup-driver

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM photon:5.0
+FROM photon:4.0
+RUN tdnf -y upgrade && tdnf clean all
 COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /vddkLibs/
 ADD /bin/linux/amd64/backup-driver* /backup-driver
 ENTRYPOINT ["/backup-driver"]

Dockerfile-datamgr

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 
-FROM photon:5.0
+FROM photon:4.0
+RUN tdnf -y upgrade && tdnf clean all
 ADD /bin/linux/amd64/data-* /datamgr
 COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /vddkLibs/
 ENTRYPOINT ["/datamgr"]

Dockerfile-plugin

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 
-FROM photon:5.0
+FROM photon:4.0
+RUN tdnf -y upgrade && tdnf clean all
 ADD /bin/linux/amd64/velero-* /plugins/
 ADD /bin/linux/amd64/data-* /
 ADD /bin/linux/amd64/backup-driver* /

changelogs/CHANGELOG-1.5.md

@@ -2,11 +2,32 @@
 
 ## v1.5.1
 
-Date: 2022-4-27
+Date: 2022-5-2
 
 ### Changes
 
 - Remove busybox reference from Dockerfiles ([#524](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/524), [@deepakkinni](https://github.com/deepakkinni))
+- Use Photon 4.0 base image in Dockerfiles ([#528](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/528), [@deepakkinni](https://github.com/deepakkinni))
+- Update consumed velero to 1.10.2 ([#529](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/529), [@deepakkinni](https://github.com/deepakkinni))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/vmware-tanzu/velero: [v1.10.1 → v1.10.2](https://github.com/vmware-tanzu/velero/compare/v1.10.1...v1.10.2)
+
+### Removed
+- github.com/armon/consul-api: [eb2c6b5](https://github.com/armon/consul-api/tree/eb2c6b5)
+- github.com/blang/semver: [v3.5.0+incompatible](https://github.com/blang/semver/tree/v3.5.0)
+- github.com/mattn/go-runewidth: [v0.0.2](https://github.com/mattn/go-runewidth/tree/v0.0.2)
+- github.com/olekukonko/tablewriter: [a0225b3](https://github.com/olekukonko/tablewriter/tree/a0225b3)
+- github.com/ugorji/go: [v1.1.4](https://github.com/ugorji/go/tree/v1.1.4)
+- github.com/urfave/cli: [v1.20.0](https://github.com/urfave/cli/tree/v1.20.0)
+- github.com/xordataexchange/crypt: [b2862e3](https://github.com/xordataexchange/crypt/tree/b2862e3)
+- go.etcd.io/etcd: 17cef6e
+- gopkg.in/cheggaaa/pb.v1: v1.0.25
 
 ## v1.5.0
 

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.1
 	github.com/vmware-tanzu/astrolabe v0.6.0
-	github.com/vmware-tanzu/velero v1.10.1
+	github.com/vmware-tanzu/velero v1.10.2
 	github.com/vmware/govmomi v0.22.2-0.20200329013745-f2eef8fc745f
 	github.com/vmware/virtual-disks v0.0.4
 	k8s.io/api v0.24.2
@@ -107,7 +107,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -156,7 +155,6 @@ require (
 	k8s.io/cli-runtime v0.24.0 // indirect
 	k8s.io/component-base v0.24.2 // indirect
 	k8s.io/klog/v2 v2.60.1 // indirect
-	k8s.io/kube-aggregator v0.19.12 // indirect
 	k8s.io/kube-openapi v0.0.0-20220614142933-1062c7ade5f8 // indirect
 	sigs.k8s.io/controller-runtime v0.12.2 // indirect
 	sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect

pkg/cmd/backupdriver/backupdriver.go

@@ -46,7 +46,7 @@ func NewCommand(name string) *cobra.Command {
 		    those tasks. The backup driver runs in separate container from the velero server`,
 	}
 
-	f := client.NewFactory(name, "", config)
+	f := client.NewFactory(name, config)
 	f.BindFlags(c.PersistentFlags())
 
 	c.AddCommand(

pkg/cmd/datamgr/datamgr.go

@@ -47,7 +47,7 @@ func NewCommand(name string) *cobra.Command {
 			in separate container from the velero server`,
 	}
 
-	f := client.NewFactory(name, "", config)
+	f := client.NewFactory(name, config)
 	f.BindFlags(c.PersistentFlags())
 
 	c.AddCommand(