From e1a4664e9d70c94e729d308a0eb8b8bff8b4d023 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Thu, 2 Feb 2023 21:16:18 +0100 Subject: [PATCH] Mediawiki convertido a helm --- HTTPS/docker-compose.yml | 8 +- HTTPS/docker-compose.yml.copia | 17 ++++ HelmCharts/helmMediawiki.sh | 14 +++ HelmCharts/mediawiki-chart/.helmignore | 23 +++++ HelmCharts/mediawiki-chart/Chart.yaml | 24 ++++++ .../templates/mediawiki-deployment.yaml | 85 +++++++++++++++++++ .../templates/mediawiki-secrets.yaml | 9 ++ .../templates/mysql-deployment-mw.yaml | 73 ++++++++++++++++ .../templates/php-myadmin-mw-deployment.yaml | 57 +++++++++++++ .../templates/registry-secrets.yaml | 11 +++ HelmCharts/mediawiki-chart/values.yaml | 82 ++++++++++++++++++ HelmCharts/preparaMediawiki/mw-namespace.yaml | 4 + .../preparaMediawiki/pv-local-mediawiki.yaml | 12 +++ .../preparaMediawiki/pv-local-mysql-mw.yaml | 11 +++ 14 files changed, 426 insertions(+), 4 deletions(-) create mode 100644 HTTPS/docker-compose.yml.copia create mode 100644 HelmCharts/helmMediawiki.sh create mode 100644 HelmCharts/mediawiki-chart/.helmignore create mode 100644 HelmCharts/mediawiki-chart/Chart.yaml create mode 100644 HelmCharts/mediawiki-chart/templates/mediawiki-deployment.yaml create mode 100644 HelmCharts/mediawiki-chart/templates/mediawiki-secrets.yaml create mode 100644 HelmCharts/mediawiki-chart/templates/mysql-deployment-mw.yaml create mode 100644 HelmCharts/mediawiki-chart/templates/php-myadmin-mw-deployment.yaml create mode 100644 HelmCharts/mediawiki-chart/templates/registry-secrets.yaml create mode 100644 HelmCharts/mediawiki-chart/values.yaml create mode 100644 HelmCharts/preparaMediawiki/mw-namespace.yaml create mode 100644 HelmCharts/preparaMediawiki/pv-local-mediawiki.yaml create mode 100644 HelmCharts/preparaMediawiki/pv-local-mysql-mw.yaml diff --git a/HTTPS/docker-compose.yml b/HTTPS/docker-compose.yml index 133cb426..70e6bbfc 100644 --- a/HTTPS/docker-compose.yml +++ b/HTTPS/docker-compose.yml @@ -8,10 +8,10 @@ services: - 443:443 restart: always volumes: - - ./nginx/conf:/etc/nginx/conf.d/:ro - - ./certbot/www:/var/www/certbot/:ro + - /mnt/cluster/miweb/conf:/etc/nginx/conf.d/:ro + - /mnt/cluster/miweb/www:/var/www/certbot/:ro certbot: image: certbot/certbot:latest volumes: - - ./certbot/www/:/var/www/certbot/:rw - - ./certbot/conf/:/etc/letsencrypt/:rw + - /mnt/cluster/miweb/certbot/www/:/var/www/certbot/:rw + - /mnt/cluster/miweb/certbot/conf/:/etc/letsencrypt/:rw diff --git a/HTTPS/docker-compose.yml.copia b/HTTPS/docker-compose.yml.copia new file mode 100644 index 00000000..133cb426 --- /dev/null +++ b/HTTPS/docker-compose.yml.copia @@ -0,0 +1,17 @@ +version: '3' + +services: + webserver: + image: nginx:latest + ports: + - 80:80 + - 443:443 + restart: always + volumes: + - ./nginx/conf:/etc/nginx/conf.d/:ro + - ./certbot/www:/var/www/certbot/:ro + certbot: + image: certbot/certbot:latest + volumes: + - ./certbot/www/:/var/www/certbot/:rw + - ./certbot/conf/:/etc/letsencrypt/:rw diff --git a/HelmCharts/helmMediawiki.sh b/HelmCharts/helmMediawiki.sh new file mode 100644 index 00000000..0acef34b --- /dev/null +++ b/HelmCharts/helmMediawiki.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +if [ "$1" = "i" ] +then + kubectl apply -f ./preparaMediawiki/mw-namespace.yaml + kubectl apply -f ./preparaMediawiki/pv-local-mysql-mw.yaml + kubectl apply -f ./preparaMediawiki/pv-local-mediawiki.yaml + helm install mediawiki mediawiki-chart/ +else + helm uninstall mediawiki + kubectl delete -f ./preparaMediawiki/mw-namespace.yaml + kubectl delete -f ./preparaMediawiki/pv-local-mysql-mw.yaml + kubectl delete -f ./preparaMediawiki/pv-local-mediawiki.yaml +fi diff --git a/HelmCharts/mediawiki-chart/.helmignore b/HelmCharts/mediawiki-chart/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/HelmCharts/mediawiki-chart/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/HelmCharts/mediawiki-chart/Chart.yaml b/HelmCharts/mediawiki-chart/Chart.yaml new file mode 100644 index 00000000..80b550d7 --- /dev/null +++ b/HelmCharts/mediawiki-chart/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: mediawiki-chart +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/HelmCharts/mediawiki-chart/templates/mediawiki-deployment.yaml b/HelmCharts/mediawiki-chart/templates/mediawiki-deployment.yaml new file mode 100644 index 00000000..32797dbe --- /dev/null +++ b/HelmCharts/mediawiki-chart/templates/mediawiki-deployment.yaml @@ -0,0 +1,85 @@ +apiVersion: v1 +kind: Service +metadata: + name: mediawiki + namespace: mediawiki + labels: + app: mediawiki +spec: + type: NodePort + ports: + - port: 80 + nodePort: 30098 + targetPort: mediawiki + selector: + app: mediawiki + tier: frontend +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: mw-pv-claim + namespace: mediawiki + labels: + app: mediawiki +spec: + accessModes: + - ReadWriteOnce + storageClassName: "" + resources: + requests: + storage: 10Gi +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: mediawiki + namespace: mediawiki + labels: + app: mediawiki +spec: + selector: + matchLabels: + app: mediawiki + tier: frontend + strategy: + type: Recreate + template: + metadata: + labels: + app: mediawiki + tier: frontend + spec: + containers: + # - image: mediawiki + - image: docker-registry:32000/mediawiki:1.0 + name: mediawiki + env: + - name: DB_TYPE + value: mysql + - name: DB_NAME + value: mediawiki + - name: DB_HOST + value: mediawiki-mysql + - name: DB_PASS + valueFrom: + secretKeyRef: + name: mysqlmw-pass + key: password + - name: DB_USER + valueFrom: + secretKeyRef: + name: mysqlmw-pass + key: db_user + ports: + - containerPort: 80 + name: mediawiki + volumeMounts: + - name: mediawiki-persistent-storage + mountPath: /var/www/html + imagePullSecrets: + - name: reg-cred-secret + volumes: + - name: mediawiki-persistent-storage + persistentVolumeClaim: + claimName: mw-pv-claim diff --git a/HelmCharts/mediawiki-chart/templates/mediawiki-secrets.yaml b/HelmCharts/mediawiki-chart/templates/mediawiki-secrets.yaml new file mode 100644 index 00000000..78e68a64 --- /dev/null +++ b/HelmCharts/mediawiki-chart/templates/mediawiki-secrets.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: mysqlmw-pass + namespace: mediawiki +data: + password: RHNhLTAyMTM= + db_user: cm9vdA== + db_passwd: RHNhLTAyMTM= diff --git a/HelmCharts/mediawiki-chart/templates/mysql-deployment-mw.yaml b/HelmCharts/mediawiki-chart/templates/mysql-deployment-mw.yaml new file mode 100644 index 00000000..86c7ab83 --- /dev/null +++ b/HelmCharts/mediawiki-chart/templates/mysql-deployment-mw.yaml @@ -0,0 +1,73 @@ +apiVersion: v1 +kind: Service +metadata: + name: mediawiki-mysql + namespace: mediawiki + labels: + app: mediawiki +spec: + type: NodePort + ports: + - name: mysql + port: 3306 + nodePort: 30381 + targetPort: mysql + selector: + app: mediawiki + tier: mysql +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: mysql-mw-pv-claim + namespace: mediawiki + labels: + app: mediawiki +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Gi +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: mediawiki-mysql + namespace: mediawiki + labels: + app: mediawiki +spec: + selector: + matchLabels: + app: mediawiki + tier: mysql + strategy: + type: Recreate + template: + metadata: + labels: + app: mediawiki + tier: mysql + spec: + containers: + - image: docker-registry:32000/mariadb:1.0 + name: mysql + env: + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: mysqlmw-pass + key: password + ports: + - containerPort: 3306 + name: mysql + volumeMounts: + - name: mysql-persistent-storage + mountPath: /var/lib/mysql + imagePullSecrets: + - name: reg-cred-secret + volumes: + - name: mysql-persistent-storage + persistentVolumeClaim: + claimName: mysql-mw-pv-claim diff --git a/HelmCharts/mediawiki-chart/templates/php-myadmin-mw-deployment.yaml b/HelmCharts/mediawiki-chart/templates/php-myadmin-mw-deployment.yaml new file mode 100644 index 00000000..e18086d3 --- /dev/null +++ b/HelmCharts/mediawiki-chart/templates/php-myadmin-mw-deployment.yaml @@ -0,0 +1,57 @@ +apiVersion: v1 +kind: Service +metadata: + name: phpmyadmin-mediawiki + namespace: mediawiki + labels: + app: mediawiki +spec: + selector: + app: mediawiki + tier: phpmyadmin + type: NodePort + ports: + - name: phpadmin + port: 80 + nodePort: 30380 + targetPort: phpmyadm +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: phpmyadmin-mediawiki + namespace: mediawiki + labels: + app: mediawiki +spec: + selector: + matchLabels: + app: mediawiki + tier: phpmyadmin + strategy: + type: Recreate + template: + metadata: + labels: + app: mediawiki + tier: phpmyadmin + spec: + containers: + - name: phpmyadmin + image: docker-registry:32000/phpmyadmin:1.0 + ports: + - containerPort: 80 + name: phpmyadm + env: + - name: PMA_HOST + value: mediawiki-mysql + - name: PMA_PORT + value: "3306" + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: mysqlmw-pass + key: password + imagePullSecrets: + - name: reg-cred-secret + diff --git a/HelmCharts/mediawiki-chart/templates/registry-secrets.yaml b/HelmCharts/mediawiki-chart/templates/registry-secrets.yaml new file mode 100644 index 00000000..b0df54e1 --- /dev/null +++ b/HelmCharts/mediawiki-chart/templates/registry-secrets.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +data: + .dockerconfigjson: eyJhdXRocyI6eyJkb2NrZXItcmVnaXN0cnk6MzIwMDAiOnsidXNlcm5hbWUiOiJjcmV5bG9wZXoiLCJwYXNzd29yZCI6IlJleS0xMTc2IiwiYXV0aCI6IlkzSmxlV3h2Y0dWNk9sSmxlUzB4TVRjMiJ9fX0= +kind: Secret +metadata: + creationTimestamp: "2023-01-29T10:54:14Z" + name: reg-cred-secret + namespace: mediawiki + resourceVersion: "19890385" + uid: 66b3b7c5-26c1-4e5a-af4e-dc973aaafe4b +type: kubernetes.io/dockerconfigjson diff --git a/HelmCharts/mediawiki-chart/values.yaml b/HelmCharts/mediawiki-chart/values.yaml new file mode 100644 index 00000000..1de36967 --- /dev/null +++ b/HelmCharts/mediawiki-chart/values.yaml @@ -0,0 +1,82 @@ +# Default values for mediawiki-chart. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [reg-cred-secret] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: NodePort + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/HelmCharts/preparaMediawiki/mw-namespace.yaml b/HelmCharts/preparaMediawiki/mw-namespace.yaml new file mode 100644 index 00000000..12b611d5 --- /dev/null +++ b/HelmCharts/preparaMediawiki/mw-namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: mediawiki diff --git a/HelmCharts/preparaMediawiki/pv-local-mediawiki.yaml b/HelmCharts/preparaMediawiki/pv-local-mediawiki.yaml new file mode 100644 index 00000000..8fda6221 --- /dev/null +++ b/HelmCharts/preparaMediawiki/pv-local-mediawiki.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: mw-folder +spec: + capacity: + storage: 10Gi + accessModes: + - ReadWriteOnce + hostPath: + path: "/mnt/cluster/mediawiki/mediawiki" + diff --git a/HelmCharts/preparaMediawiki/pv-local-mysql-mw.yaml b/HelmCharts/preparaMediawiki/pv-local-mysql-mw.yaml new file mode 100644 index 00000000..6dc453f9 --- /dev/null +++ b/HelmCharts/preparaMediawiki/pv-local-mysql-mw.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: mw-data +spec: + capacity: + storage: 20Gi + accessModes: + - ReadWriteOnce + hostPath: + path: "/mnt/cluster/mediawiki/mediawiki-db"