diff --git a/.vib/wordpress/cypress/cypress.json b/.vib/wordpress/cypress/cypress.json index 6607a2e7fd..85a72440fb 100644 --- a/.vib/wordpress/cypress/cypress.json +++ b/.vib/wordpress/cypress/cypress.json @@ -1,5 +1,5 @@ { - "baseUrl": "http://192.168.64.101/", + "baseUrl": "http://localhost/", "env": { "username": "test_user", "password": "ComplicatedPassword123!4", @@ -9,7 +9,7 @@ "smtpPort": "120", "smtpUser": "test_mail_user", "wordpressFirstName": "TestName", - "wordpressLastName":"TestLastName" + "wordpressLastName": "TestLastName" }, - "defaultCommandTimeout":30000 + "defaultCommandTimeout": 30000 } diff --git a/.vib/wordpress/cypress/cypress/integration/wordpress_spec.js b/.vib/wordpress/cypress/cypress/integration/wordpress_spec.js index 5e5628a5b2..61e9de886c 100644 --- a/.vib/wordpress/cypress/cypress/integration/wordpress_spec.js +++ b/.vib/wordpress/cypress/cypress/integration/wordpress_spec.js @@ -98,9 +98,12 @@ it('checks if admin can create a post', () => { cy.get('.editor-post-saved-state').and('have.text', 'Saved'); }); -it('checks the SMTP configuration', () => { +/* TEMPORARILY SHUTTING DOWN THIS TEST DUE TO MAINTENANCE */ + +it.skip('checks the SMTP configuration', () => { cy.login(); cy.visit('/wp-admin/admin.php?page=wp-mail-smtp'); + cy.reload(); cy.contains('div', 'WP Mail SMTP'); cy.get('#wp-mail-smtp-setting-smtp-host').should( 'have.value', diff --git a/.vib/wordpress/cypress/cypress/support/commands.js b/.vib/wordpress/cypress/cypress/support/commands.js index 9d306d228e..74abb93a5d 100644 --- a/.vib/wordpress/cypress/cypress/support/commands.js +++ b/.vib/wordpress/cypress/cypress/support/commands.js @@ -1,6 +1,7 @@ // Added to slow down Cypress test execution without using hardcoded waits. If removed, there will be false positives. const COMMAND_DELAY = 1000; +const TYPE_DELAY = 100; for (const command of ['click']) { Cypress.Commands.overwrite(command, (originalFn, ...args) => { @@ -14,6 +15,18 @@ for (const command of ['click']) { }); } +for (const command of ['type']) { + Cypress.Commands.overwrite(command, (originalFn, ...args) => { + const origVal = originalFn(...args); + + return new Promise((resolve) => { + setTimeout(() => { + resolve(origVal); + }, COMMAND_DELAY); + }); + }); +} + Cypress.Commands.add( 'login', (username = Cypress.env('username'), password = Cypress.env('password')) => { diff --git a/.vib/wordpress/goss/goss.yaml b/.vib/wordpress/goss/goss.yaml index 971517877f..d6ecc3951b 100644 --- a/.vib/wordpress/goss/goss.yaml +++ b/.vib/wordpress/goss/goss.yaml @@ -59,14 +59,6 @@ command: - '1002' stderr: [ ] timeout: 20000 - wordpress-plugin-list: - exec: wp plugin list - exit-status: 0 - stdout: - - "advanced-cache.php" - - "google-analytics-for-wordpress" - stderr: [ ] - timeout: 20000 addr: tcp://wordpress-mariadb:3306: reachable: true diff --git a/.vib/wordpress/vib-publish.json b/.vib/wordpress/vib-publish.json index 6adf3ea226..512a3ce180 100644 --- a/.vib/wordpress/vib-publish.json +++ b/.vib/wordpress/vib-publish.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/wordpress" }, - "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZAp3b3JkcHJlc3NQbHVnaW5zOiBhbGwKY29udGFpbmVyU2VjdXJpdHlDb250ZXh0OgogIGVuYWJsZWQ6IHRydWUKICBydW5Bc1VzZXI6IDEwMDIKICBydW5Bc05vblJvb3Q6IHRydWUKd29yZHByZXNzVGFibGVQcmVmaXg6IHdvcmRwcmVzc18K", + "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZApjb250YWluZXJTZWN1cml0eUNvbnRleHQ6CiAgZW5hYmxlZDogdHJ1ZQogIHJ1bkFzVXNlcjogMTAwMgogIHJ1bkFzTm9uUm9vdDogdHJ1ZQp3b3JkcHJlc3NUYWJsZVByZWZpeDogd29yZHByZXNzXw==", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { @@ -35,9 +35,7 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": [ - "OS" - ] + "vuln_type": ["OS"] } }, { diff --git a/.vib/wordpress/vib-verify.json b/.vib/wordpress/vib-verify.json index 3711196610..ed1d4394de 100644 --- a/.vib/wordpress/vib-verify.json +++ b/.vib/wordpress/vib-verify.json @@ -22,7 +22,7 @@ "url": "{SHA_ARCHIVE}", "path": "/bitnami/wordpress" }, - "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZAp3b3JkcHJlc3NQbHVnaW5zOiBhbGwKY29udGFpbmVyU2VjdXJpdHlDb250ZXh0OgogIGVuYWJsZWQ6IHRydWUKICBydW5Bc1VzZXI6IDEwMDIKICBydW5Bc05vblJvb3Q6IHRydWUKd29yZHByZXNzVGFibGVQcmVmaXg6IHdvcmRwcmVzc18K", + "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZApjb250YWluZXJTZWN1cml0eUNvbnRleHQ6CiAgZW5hYmxlZDogdHJ1ZQogIHJ1bkFzVXNlcjogMTAwMgogIHJ1bkFzTm9uUm9vdDogdHJ1ZQp3b3JkcHJlc3NUYWJsZVByZWZpeDogd29yZHByZXNzXw==", "target_platform": { "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { diff --git a/bitnami/wordpress/Chart.yaml b/bitnami/wordpress/Chart.yaml index 34218af440..faea76e6ec 100644 --- a/bitnami/wordpress/Chart.yaml +++ b/bitnami/wordpress/Chart.yaml @@ -35,4 +35,4 @@ name: wordpress sources: - https://github.com/bitnami/bitnami-docker-wordpress - https://wordpress.org/ -version: 14.0.3 +version: 14.0.4 diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index a1e003622b..1c910b482e 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -62,6 +62,7 @@ The command removes all the Kubernetes components associated with the chart and | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | | `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | + ### Common parameters | Name | Description | Value | @@ -77,17 +78,19 @@ The command removes all the Kubernetes components associated with the chart and | `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | | `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | + ### WordPress Image parameters | Name | Description | Value | | ------------------- | ---------------------------------------------------- | --------------------- | | `image.registry` | WordPress image registry | `docker.io` | | `image.repository` | WordPress image repository | `bitnami/wordpress` | -| `image.tag` | WordPress image tag (immutable tags are recommended) | `5.9.3-debian-10-r11` | +| `image.tag` | WordPress image tag (immutable tags are recommended) | `5.9.3-debian-10-r24` | | `image.pullPolicy` | WordPress image pull policy | `IfNotPresent` | | `image.pullSecrets` | WordPress image pull secrets | `[]` | | `image.debug` | Specify if debug values should be set | `false` | + ### WordPress Configuration parameters | Name | Description | Value | @@ -127,6 +130,7 @@ The command removes all the Kubernetes components associated with the chart and | `extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | | `extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | + ### WordPress Multisite Configuration parameters | Name | Description | Value | @@ -136,6 +140,7 @@ The command removes all the Kubernetes components associated with the chart and | `multisite.networkType` | WordPress Multisite network type to enable. Allowed values: `subfolder`, `subdirectory` or `subdomain`. | `subdomain` | | `multisite.enableNipIoRedirect` | Whether to enable IP address redirection to nip.io wildcard DNS. Useful when running on an IP address with subdomain network type. | `false` | + ### WordPress deployment parameters | Name | Description | Value | @@ -195,6 +200,7 @@ The command removes all the Kubernetes components associated with the chart and | `customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | | `lifecycleHooks` | for the WordPress container(s) to automate configuration before or after startup | `{}` | + ### Traffic Exposure Parameters | Name | Description | Value | @@ -226,6 +232,7 @@ The command removes all the Kubernetes components associated with the chart and | `ingress.extraTls` | TLS configuration for additional hostname(s) to be covered with this ingress record | `[]` | | `ingress.secrets` | Custom TLS certificates as secrets | `[]` | + ### Persistence Parameters | Name | Description | Value | @@ -241,13 +248,14 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | | `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | | `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `10-debian-10-r395` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `10-debian-10-r408` | | `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | | `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | | `volumePermissions.resources.requests` | The requested resources for the init container | `{}` | | `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container | `0` | + ### Other Parameters | Name | Description | Value | @@ -265,6 +273,7 @@ The command removes all the Kubernetes components associated with the chart and | `autoscaling.targetCPU` | Target CPU utilization percentage | `50` | | `autoscaling.targetMemory` | Target Memory utilization percentage | `50` | + ### Metrics Parameters | Name | Description | Value | @@ -272,7 +281,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a sidecar prometheus exporter to expose metrics | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | | `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-10-r115` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-10-r128` | | `metrics.image.pullPolicy` | Apache exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Apache exporter image pull secrets | `[]` | | `metrics.containerPorts.metrics` | Prometheus exporter container port | `9117` | @@ -312,6 +321,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` | + ### NetworkPolicy parameters | Name | Description | Value | @@ -332,6 +342,7 @@ The command removes all the Kubernetes components associated with the chart and | `networkPolicy.egressRules.denyConnectionsToExternal` | Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). | `false` | | `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | + ### Database Parameters | Name | Description | Value | @@ -360,6 +371,7 @@ The command removes all the Kubernetes components associated with the chart and | `externalCache.host` | External cache server host | `localhost` | | `externalCache.port` | External cache server port | `11211` | + The above parameters map to the env variables defined in [bitnami/wordpress](https://github.com/bitnami/bitnami-docker-wordpress). For more information please refer to the [bitnami/wordpress](https://github.com/bitnami/bitnami-docker-wordpress) image documentation. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/bitnami/wordpress/values.yaml b/bitnami/wordpress/values.yaml index 2b8fd26418..8d48bb6c8f 100644 --- a/bitnami/wordpress/values.yaml +++ b/bitnami/wordpress/values.yaml @@ -72,7 +72,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/wordpress - tag: 5.9.3-debian-10-r23 + tag: 5.9.3-debian-10-r24 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -813,7 +813,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.11.0-debian-10-r127 + tag: 0.11.0-debian-10-r128 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.