Skip to content

Commit

Permalink
Merge pull request #100 from blackpiglet/update-v1.5-image
Browse files Browse the repository at this point in the history
Update v1.5 image
  • Loading branch information
qiuming-best authored Jun 14, 2022
2 parents c48ee5e + 290903a commit f5da82c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/auto-assignees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ reviewers:

groups:
maintainers:
- jenting
- sseago
- reasonerjt
- ywk253100
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.17
- name: Set up Go 1.17.11
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.17.11
id: go

- name: Check out the code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.17.11
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM golang:1.17-buster AS build
FROM --platform=$BUILDPLATFORM golang:1.17.11-buster AS build

ARG TARGETOS
ARG TARGETARCH
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Below is a listing of plugin versions and respective Velero versions that are co

| Plugin Version | Velero Version |
|-----------------|----------------|
| v1.5.x | v1.9.x |
| v1.4.x | v1.8.x |
| v1.3.x | v1.7.x |
| v1.2.x | v1.6.x |
Expand Down Expand Up @@ -200,7 +201,7 @@ Install Velero, including all prerequisites, into the cluster and start the depl
```bash
velero install \
--provider gcp \
--plugins velero/velero-plugin-for-gcp:v1.4.0 \
--plugins velero/velero-plugin-for-gcp:v1.5.0 \
--bucket $BUCKET \
--secret-file ./credentials-velero
```
Expand All @@ -212,7 +213,7 @@ You must add a service account annotation to the Kubernetes service account so t
```bash
velero install \
--provider gcp \
--plugins velero/velero-plugin-for-gcp:v1.4.0 \
--plugins velero/velero-plugin-for-gcp:v1.5.0 \
--bucket $BUCKET \
--no-secret \
--sa-annotations iam.gke.io/gcp-service-account=[$GSA_NAME]@[$PROJECT_ID].iam.gserviceaccount.com \
Expand Down
7 changes: 7 additions & 0 deletions changelogs/CHANGELOG-1.5.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## All changes

- Add Shubham to auto-assignees. (#96, @sseago)
- Use scratch as the base image. (#95, @ywk253100)
- Bump up the version of library go-plugin. (#94, @ywk53100)
- Remove jenting from maintainers. (#93, @jenting)
- Use Project ID setting for volumeProject. (#92, @mayeco)
1 change: 0 additions & 1 deletion changelogs/unreleased/84-jxun

This file was deleted.

0 comments on commit f5da82c

Please sign in to comment.