Skip to content

Commit ced97dc

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #109 from modzilla99/master
Fix Execution on Fedora 36 and Kubernetes v1.24.3
2 parents 1978397 + 76ba975 commit ced97dc

File tree

15 files changed

+48
-35
lines changed

15 files changed

+48
-35
lines changed

‎.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
4848
push: true
4949
# keep tag in sync with deploy/base/Dockerfile:GANESHA_VERSION
50-
tags: ghcr.io/${{ github.repository_owner }}/nfs-ganesha:V3.5
50+
tags: ghcr.io/${{ github.repository_owner }}/nfs-ganesha:V4.0.8

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# v1.6.0
2+
- Rebase on Fedora 36
3+
- Upgrade Ganesha to 4.0.8
4+
- Switch to new repo for dbus
5+
16
# v1.0.8
27
- Add mountOptions StorageClass parameter (#84) (see [Usage](./docs/usage.md) for complete SC parameter info)
38
- Replace root-squash argument with a rootSquash SC parameter (#86) (see [Usage](./docs/usage.md) for complete SC parameter info)

‎charts/nfs-server-provisioner/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
2-
appVersion: 3.0.0
2+
appVersion: 4.0.8
33
description: nfs-server-provisioner is an out-of-tree dynamic provisioner for Kubernetes. You can use it to quickly & easily deploy shared storage that works almost anywhere.
44
name: nfs-server-provisioner
5-
version: 1.5.0
5+
version: 1.6.0
66
maintainers:
77
- name: kiall
88
email: [email protected]

‎charts/nfs-server-provisioner/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ their default values.
5757
|:-------------------------------|:----------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------|
5858
| `extraArgs` | [Additional command line arguments](https://github.com/kubernetes-incubator/external-storage/blob/HEAD/nfs/docs/deployment.md#arguments) | `{}`
5959
| `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) |
60-
| `image.repository` | The image repository to pull from | `k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0` |
61-
| `image.tag` | The image tag to pull | `v3.0.0` |
60+
| `image.repository` | The image repository to pull from | `k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8` |
61+
| `image.tag` | The image tag to pull | `v4.0.8` |
6262
| `image.digest` | The image digest to pull, this option has precedence over `image.tag` | `nil` |
6363
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
6464
| `service.type` | service type | `ClusterIP` |

‎charts/nfs-server-provisioner/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replicaCount: 1
88

99
image:
1010
repository: k8s.gcr.io/sig-storage/nfs-provisioner
11-
tag: v3.0.0
11+
tag: v4.0.8
1212
# digest:
1313
pullPolicy: IfNotPresent
1414

‎deploy/base/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# arm64 architectures.
1919
#
2020
# List of Fedora versions: https://en.wikipedia.org/wiki/Fedora_version_history#Version_history
21-
ARG FEDORA_VERSION=35
21+
ARG FEDORA_VERSION=36
2222

2323

2424

@@ -51,7 +51,7 @@ RUN dnf install -y \
5151

5252
# Clone specific version of ganesha
5353
# Keep version in sync with .github/workflows/docker-build.yml
54-
ARG GANESHA_VERSION=V3.5
54+
ARG GANESHA_VERSION=V4.0.8
5555
RUN git clone --branch ${GANESHA_VERSION} --recurse-submodules https://github.com/nfs-ganesha/nfs-ganesha
5656
WORKDIR /nfs-ganesha
5757
RUN mkdir -p /usr/local \

‎deploy/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Update only after new version of deploy/base/Dockerfile change has built
16-
ARG GANESHA_VERSION=V3.5
16+
ARG GANESHA_VERSION=V4.0.8
1717

1818

1919
FROM ghcr.io/kubernetes-sigs/nfs-ganesha:${GANESHA_VERSION}

‎deploy/kubernetes/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
serviceAccount: nfs-provisioner
6464
containers:
6565
- name: nfs-provisioner
66-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
66+
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
6767
ports:
6868
- name: nfs
6969
containerPort: 2049

‎deploy/kubernetes/pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
serviceAccount: nfs-provisioner
1212
containers:
1313
- name: nfs-provisioner
14-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
14+
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
1515
ports:
1616
- name: nfs
1717
containerPort: 2049

‎deploy/kubernetes/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
terminationGracePeriodSeconds: 10
6464
containers:
6565
- name: nfs-provisioner
66-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
66+
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
6767
ports:
6868
- name: nfs
6969
containerPort: 2049

0 commit comments

Comments
 (0)