Changes for page XWiki (Helm)

Last modified by Itzhak Daniel on 2024/04/29 16:35

From 16.1 to 15.1

From version 22.1

edited by Itzhak Daniel
on 2024/04/29 16:35

Change comment: There is no comment for this version

To version 16.1

edited by Itzhak Daniel
on 2024/04/29 00:40

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)
Attachments (2 modified, 0 added, 0 removed)
- Dockerfile
- values.yaml

Details

Page properties

Content

@@ -12,7 +12,7 @@
  == Background ==
--[[Behemoth LTD>>https://www.behemoth.co.il/]] was in a search for a 'knowledge base' software, a central place to collect and collaborate on documents which hold information, instructions, guides, etc. The requirement was simple, can run on Kubernetes without too much customization, building, testing and other complex CI/CD prerequisite.
++[[Behemoth LTD>>https://www.behemoth.co.il/]] was in a search for a 'knowledge base' software, a central place to collect and collaborate on documents which hold information, instructions, guide, etc. The requirement was simple, it required to be able to run on Kubernetes without too much customization, building, testing and other complex CI/CD prerequisite.
  Things may change in the future, as Kubernetes becomes the de-facto way to run Apps, so do some homework before continuing, [[Awesome Selfhosted>>https://github.com/awesome-selfhosted/awesome-selfhosted#wikis]].
@@ -49,7 +49,7 @@
  git clone --depth 1 --branch master https://github.com/xwiki/xwiki-docker.git
  {{/code}}
--Once you have the repo locally, modify the [[//Dockerfile//>>attach:Dockerfile]] as shown below:
++Once you have the repo locally, modify the //Dockerfile// as shown below:
  {{code language="git" title="# Diff"}}
@@ -89,6 +89,11 @@ COPY xwiki/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
@@ -71,15 +71,15 @@
  {{code language="sh" layout="LINENUMBERS" title="# Docker"}}
  cd ./16/mysql-tomcat/
--docker build -t behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-3 .
++docker build -t behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-2 .
  docker login
--docker push behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-3
++docker push behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-2
  {{/code}}
  {{code language="sh" layout="LINENUMBERS" title="# Podman"}}
  cd ./16/mysql-tomcat/
--buildah build -f Dockerfile -t behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-3
--podman push --creds=[Username:[Password]] behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-3
++buildah build -f Dockerfile -t behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-2
++docker push --creds=[Username:[Password]] behemothil/xwiki-mysql-tomcat-nonroot:16.2.0-2
  {{/code}}
  === Deploy ===
@@ -86,7 +86,7 @@
  We're going to deploy XWiki as a [[statefulset>>https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/]] using [[Helm>>https://helm.sh/]], the Database (MySQL) and the App, each will have a volume to store their information. As I mentioned, in our case, we need to perform several additional steps.
--After the path/loop devices were created, create the [[PVs>>attach:pv_storage.yaml]] (only if your cluster doesn't know how to provision storage for itself):
++After the path/loop devices were created, create the PVs (only if your cluster doesn't know how to provision storage for itself):
  {{code language="sh" layout="LINENUMBERS" title="# kubectl stdin"}}
  kubectl create -f - <<EOF
@@ -181,15 +181,15 @@
  Theoretically, if there aren't any breaking changes or prerequisites, you can run:
  {{code language="sh" layout="LINENUMBERS" title="# Helm upgrade"}}
--helm repo update xwiki-helm
  helm upgrade --namespace behemoth-wiki \
    --values values.yaml \
    behemoth-xwiki xwiki-helm/xwiki
++
  {{/code}}
  === Uninstall ===
--To fully remove XWiki from your cluster, use the following commands:
++To fully remove XWiki, use the following commands:
  {{code language="sh" layout="LINENUMBERS" title="# Uninstalling"}}
  helm uninstall --namespace behemoth-wiki behemoth-xwiki
@@ -207,7 +207,7 @@
 . [[Github - XWiki Contrib - Helm Charts>>https://github.com/xwiki-contrib/xwiki-helm]]
 . [[Github - XWiki - Docker>>https://github.com/xwiki/xwiki-docker/]]
 . [[Docker Hub - XWiki - Official>>https://hub.docker.com/_/xwiki]]
--1. [[Docker Hub - Behemoth LTD - Custom XWiki Non-root Image>>https://hub.docker.com/r/behemothil/xwiki-mysql-tomcat-nonroot]]
++1. [[Docker Hub - Behemoth LTD - Custom XWiki Non-root Image>>https://hub.docker.com/repository/docker/behemothil/xwiki-mysql-tomcat-nonroot/general]]
  )))
  (% class="col-xs-12 col-sm-4" %)

Dockerfile

Size

@@ -1,1 +1,1 @@
--6722
++6730

Content

@@ -91,7 +91,7 @@
  # Added by Behemoth LTD - Apr 28th, 2024
  # Fixing permissions error when using non-root user/group (30001:30001) to start the app
--RUN chown -R 30001:30001 /usr/local/tomcat
++RUN chown -R 30001:30001 /usr/local/tomcat/webapps
  USER 30001:30001
  # At this point the image is done and what remains below are the runtime configuration used by the user to configure

values.yaml

Size

@@ -1,1 +1,1 @@
--5.5 KB
++4.1 KB

Content

@@ -1,6 +4,3 @@
--# Default values for node.
--# This is a YAML-formatted file.
--# Declare variables to be passed into your templates.
  cluster:
    enabled: false
@@ -7,11 +7,8 @@
  image:
    name: xwiki
    pullPolicy: IfNotPresent
--## Image Tag useful when externalDB is been used
--## https://hub.docker.com/_/xwiki
    name: "behemothil/xwiki-mysql-tomcat-nonroot"
--  tag: "16.2.0-2"
--#  tag: '16.2.0-mysql-tomcat'
++  tag: "16.2.0-1"
  service:
    portName: node
    name: http
@@ -18,11 +18,7 @@
    type: ClusterIP
    externalPort: 80
    internalPort: 8080
--  # Set an array of externalIPs for the service
    externalIPs: []
--    # - 10.20.30.40
--    # - 10.20.30.41
--  # Reference: https://kubernetes.io/docs/reference/networking/virtual-ips/#session-affinity
    sessionAffinity: ClientIP
  resources:
    limits:
@@ -36,7 +36,6 @@
    - -Xms1024m
    - -Xmx6000m
--# Enable to choose witch kind of workload will be used: (true) StatefulSet or (false) for Deployment
  workloadStateful: true
  securityContext:
@@ -65,36 +65,20 @@
        type: "RuntimeDefault"
    enabled: true
--##
--## MySql chart configuration
--##
--## https://github.com/bitnami/charts/tree/main/bitnami/mysql
--##
  mysql:
-- ## Whether to deploy a mysql server. Set false for a different database.
    enabled: true
    image:
      tag: "8.0-debian-12"
      pullPolicy: "IfNotPresent"
    auth:
--    rootPassword: "Wxv11dZmzw4YIozxj1"
--    username: "xwiki"
--    password: "3N5NBYnb5VQfDA2gde"
--    database: "xwiki"
++    rootPassword: "ROOT_PASSWORD_CHANGEME !!!"
++    username: "USERNAME_CHANGEME !!!"
++    password: "USER_PASSWORD_CHANGEME !!!"
++    database: "DB_NAME_CHANGEME !!!"
    initdbScripts:
 -init.sql: |
        grant all privileges on *.* to xwiki@'%'
    primary:
--  #  initContainers:
--  #  - name: "fix-non-root-permissions"
--  #    image: "busybox"
--  #    imagePullPolicy: "IfNotPresent"
--  #    command: [ "chown", "-R", "30001:30001", "/opt/bitnami" ]
--  #    volumeMounts:
--  #    - name: conf
--  #      mountPath: /opt/bitnami
--    # Changed to use UTF8mb4, check future versions if this was already changed.
--    # TODO: review explicit_defaults_for_timestamp
      configuration: |-
        [mysqld]
        default_authentication_plugin=mysql_native_password
@@ -145,25 +145,12 @@
        seccompProfile:
          type: "RuntimeDefault"
--mariadb:
--  enabled: false
--
--postgresql:
--  enabled: false
--
--solr:
--  enabled: false
--
--# To use ingress for routing set ingress.enabled value to true and istio.enabled value to false
  ingress:
    enabled: true
    className: nginx
    annotations:
      kubernetes.io/ingress.class: nginx
--#    nginx.ingress.kubernetes.io/whitelist-source-range: "152.67.64.124/32, 178.255.149.139/32"
      cert-manager.io/cluster-issuer: letsencrypt-prod
--    # kubernetes.io/tls-acme: "true"
--    # ingress.kubernetes.io/rewrite-target: /
    hosts:
      - host: wiki.behemoth.co.il
        paths:
@@ -174,9 +174,6 @@
        hosts:
          - wiki.behemoth.co.il
--istio:
--  enabled: false
--
  persistence:
    enabled: true
    storageClass: "behemoth-xwiki-www"
@@ -184,19 +184,6 @@
      - ReadWriteOnce
    size: "5Gi"
--podDisruptionBudget:
--  enabled: false
--
--glowroot:
--  enabled: false
--
--logback:
--  enabled: false
--
--autoscaling:
--  enabled: false
--
--# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
  probes:
    startup:
      enabled: true
@@ -216,7 +216,6 @@
      initialDelaySeconds: 30
      timeoutSeconds: 3
      periodSeconds: 30
--    # 5 minutes
      failureThreshold: 10
      successThreshold: 1
    readiness:
@@ -227,13 +227,9 @@
      initialDelaySeconds: 30
      timeoutSeconds: 3
      periodSeconds: 30
--    # 5 minutes
      failureThreshold: 10
      successThreshold: 1
--infinispan:
--  enabled: false
--
  prometheus:
    javaagent:
      # https://github.com/prometheus/jmx_exporter
@@ -240,3 +240,23 @@
      # Enable to download and use this agent
      enabled: true
++podDisruptionBudget:
++  enabled: false
++
++solr:
++  enabled: false
++istio:
++  enabled: false
++
++glowroot:
++  enabled: false
++
++logback:
++  enabled: false
++
++autoscaling:
++  enabled: false
++
++infinispan:
++  enabled: false
++

Changes for page XWiki (Helm)

Summary

Details

Navigation

Child Pages