-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(helm)!: Update chart phpmyadmin to 16.0.0 #5846
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- kubernetes/main/apps/databases/phpmyadmin/app Kustomization: flux-system/databases-phpmyadmin HelmRelease: databases/phpmyadmin
+++ kubernetes/main/apps/databases/phpmyadmin/app Kustomization: flux-system/databases-phpmyadmin HelmRelease: databases/phpmyadmin
@@ -12,13 +12,13 @@
spec:
chart: phpmyadmin
sourceRef:
kind: HelmRepository
name: bitnami-charts
namespace: flux-system
- version: 15.0.0
+ version: 16.0.0
interval: 30m
values:
containerPorts:
http: 8080
https: 8443
containerSecurityContext: |
--- HelmRelease: databases/phpmyadmin Deployment: databases/phpmyadmin
+++ HelmRelease: databases/phpmyadmin Deployment: databases/phpmyadmin
@@ -44,23 +44,79 @@
securityContext:
fsGroup: 1001
fsGroupChangePolicy: Always
supplementalGroups: []
sysctls: []
serviceAccountName: phpmyadmin
+ initContainers:
+ - name: prepare-base-dir
+ image: docker.io/bitnami/phpmyadmin:5.1.3-debian-10-r28
+ imagePullPolicy: IfNotPresent
+ resources:
+ limits:
+ cpu: 375m
+ ephemeral-storage: 1024Mi
+ memory: 384Mi
+ requests:
+ cpu: 250m
+ ephemeral-storage: 50Mi
+ memory: 256Mi
+ securityContext:
+ allowPrivilegeEscalation: false
+ capabilities:
+ drop:
+ - ALL
+ privileged: false
+ readOnlyRootFilesystem: true
+ runAsGroup: 1001
+ runAsNonRoot: true
+ runAsUser: 1001
+ seLinuxOptions: null
+ seccompProfile:
+ type: RuntimeDefault
+ command:
+ - /bin/bash
+ args:
+ - -ec
+ - |
+ #!/bin/bash
+
+ . /opt/bitnami/scripts/liblog.sh
+ . /opt/bitnami/scripts/libfs.sh
+
+ info "Copying base dir to empty dir"
+ # In order to not break the application functionality (such as upgrades or plugins) we need
+ # to make the base directory writable, so we need to copy it to an empty dir volume
+ cp -r --preserve=mode /opt/bitnami/phpmyadmin /emptydir/app-base-dir
+
+ info "Copying symlinks to stdout/stderr"
+ # We copy the logs folder because it has symlinks to stdout and stderr
+ if ! is_dir_empty /opt/bitnami/apache/logs; then
+ cp -r /opt/bitnami/apache/logs /emptydir/apache-logs-dir
+ fi
+ info "Copying php var directory"
+ # PhpMyAdmin will fail to start if the php var folder is not populated
+ if ! is_dir_empty /opt/bitnami/php/var; then
+ cp -r /opt/bitnami/php/var /emptydir/php-var-dir
+ fi
+ info "Copy operation completed"
+ volumeMounts:
+ - name: empty-dir
+ mountPath: /emptydir
containers:
- name: phpmyadmin
image: docker.io/bitnami/phpmyadmin:5.1.3-debian-10-r28
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
privileged: false
- readOnlyRootFilesystem: false
+ readOnlyRootFilesystem: true
+ runAsGroup: 1001
runAsNonRoot: true
runAsUser: 1001
seLinuxOptions: null
seccompProfile:
type: RuntimeDefault
env:
@@ -98,9 +154,44 @@
path: /
port: http
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 30
- volumeMounts: null
- volumes: null
+ resources:
+ limits:
+ cpu: 375m
+ ephemeral-storage: 1024Mi
+ memory: 384Mi
+ requests:
+ cpu: 250m
+ ephemeral-storage: 50Mi
+ memory: 256Mi
+ volumeMounts:
+ - name: empty-dir
+ mountPath: /opt/bitnami/apache/conf
+ subPath: apache-conf-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/apache/logs
+ subPath: apache-logs-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/apache/var/run
+ subPath: apcahe-tmp-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/php/etc
+ subPath: php-conf-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/php/tmp
+ subPath: php-tmp-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/php/var
+ subPath: php-var-dir
+ - name: empty-dir
+ mountPath: /tmp
+ subPath: tmp-dir
+ - name: empty-dir
+ mountPath: /opt/bitnami/phpmyadmin
+ subPath: app-base-dir
+ volumes:
+ - name: empty-dir
+ emptyDir: {}
--- HelmRelease: databases/phpmyadmin NetworkPolicy: databases/phpmyadmin
+++ HelmRelease: databases/phpmyadmin NetworkPolicy: databases/phpmyadmin
@@ -0,0 +1,25 @@
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+ name: phpmyadmin
+ namespace: databases
+ labels:
+ app.kubernetes.io/instance: phpmyadmin
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: phpmyadmin
+spec:
+ podSelector:
+ matchLabels:
+ app.kubernetes.io/instance: phpmyadmin
+ app.kubernetes.io/name: phpmyadmin
+ policyTypes:
+ - Ingress
+ - Egress
+ egress:
+ - {}
+ ingress:
+ - ports:
+ - port: 8080
+ - port: 8443
+ |
renovate
bot
force-pushed
the
renovate/phpmyadmin-16.x
branch
from
April 4, 2024 18:59
b87cf4b
to
1e8f2ab
Compare
| datasource | package | from | to | | ---------- | ---------- | ------ | ------ | | helm | phpmyadmin | 15.0.0 | 16.0.0 |
renovate
bot
force-pushed
the
renovate/phpmyadmin-16.x
branch
from
April 4, 2024 19:00
1e8f2ab
to
14159ec
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
15.0.0
->16.0.0
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Mend Renovate. View repository job log here.