Skip to content

Commit

Permalink
Merge pull request #89 from csi-addons/main
Browse files Browse the repository at this point in the history
Sync the upstream changes from `csi-addons/kubernetes-csi-addons:main` into the `main` branch
  • Loading branch information
openshift-ci[bot] authored Oct 12, 2023
2 parents 7335c98 + 0126d83 commit aed5536
Show file tree
Hide file tree
Showing 707 changed files with 64,326 additions and 19,844 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v4
Expand All @@ -25,14 +25,14 @@ jobs:
run: make bundle

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build and push bundle container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: bundle.Dockerfile
Expand All @@ -45,23 +45,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build and push controller container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: Dockerfile
Expand All @@ -75,23 +75,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build and push sidecar container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: build/Containerfile.sidecar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: codespell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: codespell
uses: codespell-project/actions-codespell@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/kind-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.7.0
uses: helm/kind-action@v1.8.0

- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Golang
uses: actions/setup-go@v4
with:
go-version: "1.20"

- name: Build container container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: Dockerfile
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/lint-extras.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Lint Code Base
# yamllint disable-line rule:truthy
on:
push:
branches:
- main
pull_request:

permissions:
contents: read

jobs:
test-lint:
runs-on: ubuntu-latest

steps:
- name: checkout source
uses: actions/checkout@v4

- name: Lint Code Base
uses: super-linter/super-linter/slim@v5
env:
FILTER_REGEX_EXCLUDE: >
(.*vendor/.*)|(.*tools/vendor/.*)
VALIDATE_GO: false
VALIDATE_JSCPD: false
VALIDATE_KUBERNETES_KUBECONFORM: false
VALIDATE_PROTOBUF: false
VALIDATE_YAML: false
32 changes: 18 additions & 14 deletions .github/workflows/tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v4
Expand All @@ -29,14 +29,14 @@ jobs:
run: make bundle-validate

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build bundle container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: bundle.Dockerfile
Expand All @@ -52,23 +52,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build and push controller container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: Dockerfile
Expand All @@ -85,23 +85,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Build and push sidecar container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: build/Containerfile.sidecar
Expand All @@ -115,12 +115,16 @@ jobs:
github.repository == 'csi-addons/kubernetes-csi-addons'
&&
github.ref_type == 'tag'
needs:
- tag_bundle
- tag_controller
- tag_sidecar
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v4
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v4
Expand All @@ -27,7 +27,7 @@ jobs:
run: make bundle-validate

- name: Build bundle container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: bundle.Dockerfile
Expand All @@ -39,16 +39,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build container container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: Dockerfile
Expand All @@ -61,16 +61,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build sidecar container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: build/Containerfile.sidecar
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-golang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Golang
uses: actions/setup-go@v4
with:
go-version: "1.20"

- name: Install Protoc
uses: arduino/setup-protoc@v1
# action @v1.3.0 can install protoc 3.19, @v2 installs protoc v21.0+
uses: arduino/[email protected]
with:
version: '3.19.6'
version: "3.19.6"

- name: Run "make test"
run: make test
Expand All @@ -40,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Golang
uses: actions/setup-go@v4
Expand All @@ -55,7 +56,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Golang
uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
yamllint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: yaml-lint
uses: ibiqlik/action-yamllint@v3
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ testbin/*
bundle.Dockerfile
bundle

# generated csv file.
config/manifests/bases/csi-addons.clusterserviceversion.yaml

# editor and IDE paraphernalia
.idea
*.swp
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ All Pull-Requests are required to be reviewed by at least two others that
regularly participate in the project. There are two GitHub teams that contain
members who can approve changes:

- @csi-addons/kubernetes-csi-addons-contributors: regular contributors,
- @csi-addons/kubernetes-csi-addons-contributors: regular contributors,
sending Pull-Requests, designing new features
- @csi-addons/kubernetes-csi-addons-reviewers: contributors to the general
- @csi-addons/kubernetes-csi-addons-reviewers: contributors to the general
CSI-Addons project, sharing expertise and domain knowledge

For changes that are related to the integration with other components or affect
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM golang:1.20 as builder

# Copy the contents of the repository
ADD . /workspace/go/src/github.com/csi-addons/kubernetes-csi-addons
COPY . /workspace/go/src/github.com/csi-addons/kubernetes-csi-addons

ENV GOPATH=/workspace/go CGO_ENABLED=0
WORKDIR /workspace/go/src/github.com/csi-addons/kubernetes-csi-addons
Expand Down
Loading

0 comments on commit aed5536

Please sign in to comment.