Merge pull request #109 from modzilla99/master

Fix Execution on Fedora 36 and Kubernetes v1.24.3

Author: k8s-ci-robot

.github/workflows/docker-build.yml

@@ -47,4 +47,4 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
           push: true
           # keep tag in sync with deploy/base/Dockerfile:GANESHA_VERSION
-          tags: ghcr.io/${{ github.repository_owner }}/nfs-ganesha:V3.5
+          tags: ghcr.io/${{ github.repository_owner }}/nfs-ganesha:V4.0.8

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v1.6.0
+- Rebase on Fedora 36
+- Upgrade Ganesha to 4.0.8
+- Switch to new repo for dbus
+
 # v1.0.8
 - Add mountOptions StorageClass parameter (#84) (see [Usage](./docs/usage.md) for complete SC parameter info)
 - 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

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 3.0.0
+appVersion: 4.0.8
 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.
 name: nfs-server-provisioner
-version: 1.5.0
+version: 1.6.0
 maintainers:
 - name: kiall
   email: [email protected]

charts/nfs-server-provisioner/README.md

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

charts/nfs-server-provisioner/values.yaml

@@ -8,7 +8,7 @@ replicaCount: 1
 
 image:
   repository: k8s.gcr.io/sig-storage/nfs-provisioner
-  tag: v3.0.0
+  tag: v4.0.8
   # digest:
   pullPolicy: IfNotPresent
 

deploy/base/Dockerfile

@@ -18,7 +18,7 @@
 #       arm64 architectures.
 #
 # List of Fedora versions: https://en.wikipedia.org/wiki/Fedora_version_history#Version_history
-ARG FEDORA_VERSION=35
+ARG FEDORA_VERSION=36
 
 
 
@@ -51,7 +51,7 @@ RUN dnf install -y \
 
 # Clone specific version of ganesha
 # Keep version in sync with .github/workflows/docker-build.yml
-ARG GANESHA_VERSION=V3.5
+ARG GANESHA_VERSION=V4.0.8
 RUN git clone --branch ${GANESHA_VERSION} --recurse-submodules https://github.com/nfs-ganesha/nfs-ganesha
 WORKDIR /nfs-ganesha
 RUN mkdir -p /usr/local \

deploy/docker/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Update only after new version of deploy/base/Dockerfile change has built
-ARG GANESHA_VERSION=V3.5
+ARG GANESHA_VERSION=V4.0.8
 
 
 FROM ghcr.io/kubernetes-sigs/nfs-ganesha:${GANESHA_VERSION}

deploy/kubernetes/deployment.yaml

@@ -63,7 +63,7 @@ spec:
       serviceAccount: nfs-provisioner
       containers:
         - name: nfs-provisioner
-          image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
+          image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
           ports:
             - name: nfs
               containerPort: 2049

deploy/kubernetes/pod.yaml

@@ -11,7 +11,7 @@ spec:
   serviceAccount: nfs-provisioner
   containers:
     - name: nfs-provisioner
-      image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
+      image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
       ports:
         - name: nfs
           containerPort: 2049

deploy/kubernetes/statefulset.yaml

@@ -63,7 +63,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: nfs-provisioner
-          image: k8s.gcr.io/sig-storage/nfs-provisioner:v3.0.0
+          image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
           ports:
             - name: nfs
               containerPort: 2049