Skip to content

Commit

Permalink
Merge pull request #65 from niladrih/v0.9.0-changes
Browse files Browse the repository at this point in the history
feat(csi): update csi sidecars to the latest ones and update lib-csi
  • Loading branch information
niladrih committed Jul 24, 2023
2 parents f921fe1 + 5107264 commit 37e17c8
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 25 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
fail-fast: true
matrix:
kubernetes: [v1.25.10]
kubernetes: [v1.27.3]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -72,11 +72,14 @@ jobs:
cache: false

- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.7.2
uses: medyagh/setup-minikube@latest
with:
minikube version: v1.26.1
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
cache: false
minikube-version: 1.31.1
driver: none
kubernetes-version: ${{ matrix.kubernetes }}
cni: calico
start-args: '--install-addons=false'

- name: Build images locally
run: make device-driver-image || exit 1;
Expand All @@ -100,7 +103,7 @@ jobs:
[ -z "${{ secrets.IMAGE_ORG }}" ] && IMAGE_ORG=openebs || IMAGE_ORG=${{ secrets.IMAGE_ORG}}
echo "IMAGE_ORG=${IMAGE_ORG}" >> $GITHUB_ENV
- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down Expand Up @@ -174,20 +177,20 @@ jobs:
version: v0.5.1

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

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

- name: Login to GHCR
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
fail-fast: true
matrix:
kubernetes: [v1.25.10]
kubernetes: [v1.27.3]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -78,11 +78,14 @@ jobs:
cache: false

- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.7.2
uses: medyagh/setup-minikube@latest
with:
minikube version: v1.26.1
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
cache: false
minikube-version: 1.31.1
driver: none
kubernetes-version: ${{ matrix.kubernetes }}
cni: calico
start-args: '--install-addons=false'

- name: Build images locally
run: make device-driver-image || exit 1;
Expand Down
8 changes: 4 additions & 4 deletions deploy/device-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,10 @@ spec:
- openebs-device-controller
topologyKey: "kubernetes.io/hostname"
priorityClassName: system-cluster-critical
serviceAccount: openebs-device-controller-sa
serviceAccountName: openebs-device-controller-sa
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
imagePullPolicy: IfNotPresent
args:
- "--csi-address=$(ADDRESS)"
Expand Down Expand Up @@ -500,11 +500,11 @@ spec:
openebs.io/version: ci
spec:
priorityClassName: system-node-critical
serviceAccount: openebs-device-node-sa
serviceAccountName: openebs-device-node-sa
hostNetwork: true
containers:
- name: csi-node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
imagePullPolicy: IfNotPresent
args:
- "--v=5"
Expand Down
8 changes: 4 additions & 4 deletions deploy/yamls/device-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ spec:
- openebs-device-controller
topologyKey: "kubernetes.io/hostname"
priorityClassName: system-cluster-critical
serviceAccount: openebs-device-controller-sa
serviceAccountName: openebs-device-controller-sa
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
imagePullPolicy: IfNotPresent
args:
- "--csi-address=$(ADDRESS)"
Expand Down Expand Up @@ -259,11 +259,11 @@ spec:
openebs.io/version: ci
spec:
priorityClassName: system-node-critical
serviceAccount: openebs-device-node-sa
serviceAccountName: openebs-device-node-sa
hostNetwork: true
containers:
- name: csi-node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
imagePullPolicy: IfNotPresent
args:
- "--v=5"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/kubernetes-csi/csi-lib-utils v0.9.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.27.4
github.com/openebs/lib-csi v0.7.0
github.com/openebs/lib-csi v0.8.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.15.1
github.com/spf13/cobra v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfad
github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw=
github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
github.com/openebs/lib-csi v0.7.0 h1:n9QjgL1h5HpA73y3kaPKMO/7qletC27VXYdn0RBLWBs=
github.com/openebs/lib-csi v0.7.0/go.mod h1:e1WhYqEqiQq8d5GziJ9arNZ39MPocRCg3olNHGwW2e0=
github.com/openebs/lib-csi v0.8.0 h1:lxhv/SRjS7DBz7vTLkaDPd/FJnUftofxSFTU4fdZzW0=
github.com/openebs/lib-csi v0.8.0/go.mod h1:4yc0Q1thH+oU80z73zGELfrOw2yeLdLNIRmcrxBxsBc=
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down

0 comments on commit 37e17c8

Please sign in to comment.