diff --git a/charts/wordpress/Chart.lock b/charts/wordpress/Chart.lock index 3a392f5ab571900f8a274dfcf082acbec02019dc..b0c311bee349d8fd9c280072bdf8a9537ecc8aa9 100644 --- a/charts/wordpress/Chart.lock +++ b/charts/wordpress/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://groundhog2k.github.io/helm-charts - version: 0.1.5 -digest: sha256:14b5bf0107fb5802c95d6c1eb79d029883e9a6d4223dd70c23307b42f1a8d0a9 -generated: "2020-11-29T11:43:31.5566595+01:00" + version: 0.2.0 +digest: sha256:2a0e926c463f81bd790a89a0828030021ff40040a521703e17e66f51e4a8afde +generated: "2020-12-11T18:30:28.9506443+01:00" diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml index 91afd27bf130fb117e6ba9dde3850048276fbddb..8725d3fb74f9e869bd62ab755df2474b2b3243ab 100644 --- a/charts/wordpress/Chart.yaml +++ b/charts/wordpress/Chart.yaml @@ -8,13 +8,13 @@ maintainers: type: application # This is the chart version. -version: 0.1.5 +version: 0.2.0 # This is the version number of the application being deployed. -appVersion: "5.5.3-apache" +appVersion: "5.6.0-apache" dependencies: - name: mariadb - version: 0.1.5 + version: 0.2.0 repository: "https://groundhog2k.github.io/helm-charts" condition: mariadb.enabled diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md index 27ab6e3259295feee5b00e8d47bbef1aa4997142..cc139a288026614be71c36c04cc138f26b3bf565 100644 --- a/charts/wordpress/README.md +++ b/charts/wordpress/README.md @@ -1,6 +1,6 @@ # Wordpress -   +   A Helm chart for Wordpress on Kubernetes @@ -15,7 +15,7 @@ $ helm install my-release groundhog2k/wordpress This chart uses the original [Wordpress from Docker](https://hub.docker.com/_/wordpress) to deploy Wordpress in Kubernetes. -It fully supports the deployment of the [ARM64v8 image of Wordpress](https://hub.docker.com/r/arm64v8/wordpress) on a ARM64 based Kubernetes cluster just by exchanging the existing `image.repository` value. +It fully supports deployment of arm64v8 and amd64 multi-architecture docker image. Just set the `nodeSelector` value to `kubernetes.io/arch: "arm64"` (default is `"amd64"`) ## Prerequisites @@ -43,7 +43,7 @@ $ helm uninstall my-release | Repository | Name | Version | |------------|------|---------| -| @groundhog2k | mariadb | 0.1.5 | +| @groundhog2k | mariadb | 0.2.0 | ## Common parameters diff --git a/charts/wordpress/charts/mariadb-0.1.5.tgz b/charts/wordpress/charts/mariadb-0.1.5.tgz deleted file mode 100644 index 1a58f072434e19412e3f1daa6b74a88b5285ffc7..0000000000000000000000000000000000000000 Binary files a/charts/wordpress/charts/mariadb-0.1.5.tgz and /dev/null differ diff --git a/charts/wordpress/charts/mariadb-0.2.0.tgz b/charts/wordpress/charts/mariadb-0.2.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..1f8bed147c8db14c89e4dad9b39a250210a10a1c Binary files /dev/null and b/charts/wordpress/charts/mariadb-0.2.0.tgz differ diff --git a/charts/wordpress/values.yaml b/charts/wordpress/values.yaml index 90f7e72f9cac7142754db95eb0c4fb5e65302e36..f9279cc873a020fcb8a56fcca81eafee1abdb63e 100644 --- a/charts/wordpress/values.yaml +++ b/charts/wordpress/values.yaml @@ -4,7 +4,6 @@ replicaCount: 1 ## Netxcloud docker image -## use arm64v8/nextcloud for the same image on ARM64v8 image: repository: wordpress pullPolicy: IfNotPresent @@ -27,7 +26,7 @@ serviceAccount: name: "" ## Default node type for the image -## use arm64v8 for the arm64v8/nextcloud image +## use arm64 for the arm64v8 image nodeSelector: kubernetes.io/arch: amd64 @@ -88,7 +87,7 @@ livenessProbe: enabled: true initialDelaySeconds: 30 timeoutSeconds: 5 - failureThreshold: 6 + failureThreshold: 5 successThreshold: 1 periodSeconds: 10