From d1f846e3c863b47e246dceee2ecdc2229f79cbee Mon Sep 17 00:00:00 2001 From: sagit <36596628+Sagit-chu@users.noreply.github.com> Date: Fri, 1 Apr 2022 20:35:32 +0800 Subject: [PATCH] feat:(typecho): Add typecho (#2374) * feat:(typecho: )Add typecho * Fix Permission * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/questions.yaml * Update charts/incubator/typecho/questions.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/questions.yaml * whitespace * feat:(typecho: )Add typecho * Fix Permission * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/questions.yaml * Update charts/incubator/typecho/questions.yaml * Update charts/incubator/typecho/values.yaml * Update charts/incubator/typecho/questions.yaml * whitespace * delete Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/incubator/typecho/.helmignore | 26 ++ charts/incubator/typecho/Chart.yaml | 31 ++ charts/incubator/typecho/questions.yaml | 363 ++++++++++++++++++ .../incubator/typecho/templates/common.yaml | 1 + charts/incubator/typecho/values.yaml | 59 +++ 5 files changed, 480 insertions(+) create mode 100644 charts/incubator/typecho/.helmignore create mode 100644 charts/incubator/typecho/Chart.yaml create mode 100644 charts/incubator/typecho/questions.yaml create mode 100644 charts/incubator/typecho/templates/common.yaml create mode 100644 charts/incubator/typecho/values.yaml diff --git a/charts/incubator/typecho/.helmignore b/charts/incubator/typecho/.helmignore new file mode 100644 index 00000000000..4379e2b3014 --- /dev/null +++ b/charts/incubator/typecho/.helmignore @@ -0,0 +1,26 @@ +# 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 +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +# OWNERS file for Kubernetes +OWNERS +# helm-docs templates +*.gotmpl diff --git a/charts/incubator/typecho/Chart.yaml b/charts/incubator/typecho/Chart.yaml new file mode 100644 index 00000000000..13154cd4170 --- /dev/null +++ b/charts/incubator/typecho/Chart.yaml @@ -0,0 +1,31 @@ +apiVersion: v2 +appVersion: "1.2.0" +dependencies: +- name: common + repository: https://library-charts.truecharts.org + version: 9.2.6 +- condition: mariadb.enabled + name: mariadb + repository: https://charts.truecharts.org/ + version: 2.0.28 +description: Typecho is a PHP Blogging Platform. +home: https://github.com/truecharts/apps/tree/master/charts/stable/typecho +icon: https://truecharts.org/_static/img/appicons/typecho.png +keywords: +- typecho +- blog +kubeVersion: '>=1.16.0-0' +maintainers: +- email: info@truecharts.org + name: TrueCharts + url: https://truecharts.org +name: typecho +sources: +- https://github.com/typecho/typecho +- https://hub.docker.com/r/joyqi/typecho +version: 0.0.1 +annotations: + truecharts.org/catagories: | + - hosting + truecharts.org/SCALE-support: "true" + truecharts.org/grade: U diff --git a/charts/incubator/typecho/questions.yaml b/charts/incubator/typecho/questions.yaml new file mode 100644 index 00000000000..d2a721460aa --- /dev/null +++ b/charts/incubator/typecho/questions.yaml @@ -0,0 +1,363 @@ +# Include{groups} +portals: + open: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" +questions: + - variable: portal + group: "Container Image" + label: "Configure Portal Button" + schema: + type: dict + hidden: true + attrs: + - variable: enabled + label: "Enable" + description: "enable the portal button" + schema: + hidden: true + editable: false + type: boolean + default: true +# Include{global} + - variable: controller + group: "Controller" + label: "" + schema: + additional_attrs: true + type: dict + attrs: + - variable: advanced + label: "Show Advanced Controller Settings" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: type + description: "Please specify type of workload to deploy" + label: "(Advanced) Controller Type" + schema: + type: string + default: "deployment" + required: true + enum: + - value: "deployment" + description: "Deployment" + - value: "statefulset" + description: "Statefulset" + - value: "daemonset" + description: "Daemonset" + - variable: replicas + description: "Number of desired pod replicas" + label: "Desired Replicas" + schema: + type: int + default: 1 + required: true + - variable: strategy + description: "Please specify type of workload to deploy" + label: "(Advanced) Update Strategy" + schema: + type: string + default: "Recreate" + required: true + enum: + - value: "Recreate" + description: "Recreate: Kill existing pods before creating new ones" + - value: "RollingUpdate" + description: "RollingUpdate: Create new pods and then kill old ones" + - value: "OnDelete" + description: "(Legacy) OnDelete: ignore .spec.template changes" +# Include{controllerExpert} + - variable: secret + group: "Container Configuration" + label: "Image Secrets" + schema: + additional_attrs: true + type: dict + attrs: + - variable: TYPECHO_USER_NAME + label: "TYPECHO_USER_NAME" + description: "USER NAME" + schema: + type: string + required: true + default: "" + - variable: TYPECHO_USER_PASSWORD + label: "TYPECHO_USER_PASSWORD" + description: "USER PASSWORD" + schema: + type: string + required: true + private: true + default: "" + - variable: env + group: "Container Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: TYPECHO_SITE_URL + label: "TYPECHO_SITE_URL" + description: "Your Typecho Site URL" + schema: + type: string + required: true + default: "" + - variable: TYPECHO_USER_MAIL + label: "TYPECHO_USER_MAIL" + description: "USER EMAIL" + schema: + type: string + required: true + default: "" + - variable: MEMORY_LIMIT + label: "MEMORY_LIMIT" + description: "MEMORY_LIMIT" + schema: + type: string + required: true + default: "100M" + - variable: MAX_POST_BODY + label: "MAX_POST_BODY" + description: "MAX_POST_BODY" + schema: + type: string + required: true + default: "50M" +# Include{containerConfig} + + - variable: service + group: "Networking and Services" + label: "Configure Service(s)" + schema: + additional_attrs: true + type: dict + attrs: + - variable: main + label: "Main Service" + description: "The Primary service on which the healthcheck runs, often the webUI" + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelector} + - variable: main + label: "Main Service Port Configuration" + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: "Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 10207 + required: true + - variable: advanced + label: "Show Advanced settings" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + enum: + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - value: TCP + description: "TCP" + - value: "UDP" + description: "UDP" + - variable: nodePort + label: "Node Port (Optional)" + description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer" + schema: + type: int + min: 9000 + max: 65535 + - variable: targetPort + label: "Target Port" + description: "The internal(!) port on the container the Application runs on" + schema: + type: int + default: 80 + + - variable: serviceexpert + group: "Networking and Services" + label: "Show Expert Config" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: hostNetwork + group: "Networking and Services" + label: "Host-Networking (Complicated)" + schema: + type: boolean + default: false + +# Include{serviceExpert} + +# Include{serviceList} + + - variable: persistence + label: "Integrated Persistent Storage" + description: "Integrated Persistent Storage" + group: "Storage and Persistence" + schema: + additional_attrs: true + type: dict + attrs: + - variable: config + label: "App Config Storage" + description: "Stores the Application Config." + schema: + additional_attrs: true + type: dict + attrs: + - variable: type + label: "Type of Storage" + description: "Sets the persistence type, Anything other than PVC could break rollback!" + schema: + type: string + default: "simplePVC" + enum: + - value: "simplePVC" + description: "PVC (simple)" + - value: "simpleHP" + description: "HostPath (simple)" + - value: "emptyDir" + description: "emptyDir" + - value: "pvc" + description: "pvc" + - value: "hostPath" + description: "hostPath" +# Include{persistenceBasic} + - variable: hostPath + label: "hostPath" + description: "Path inside the container the storage is mounted" + schema: + show_if: [["type", "=", "hostPath"]] + type: hostpath + - variable: medium + label: "EmptyDir Medium" + schema: + show_if: [["type", "=", "emptyDir"]] + type: string + default: "" + enum: + - value: "" + description: "Default" + - value: "Memory" + description: "Memory" +# Include{persistenceAdvanced} +# Include{persistenceList} + + - variable: ingress + label: "" + group: "Ingress" + schema: + additional_attrs: true + type: dict + attrs: + - variable: main + label: "Main Ingress" + schema: + additional_attrs: true + type: dict + attrs: +# Include{ingressDefault} + +# Include{ingressTLS} + +# Include{ingressTraefik} + +# Include{ingressExpert} + +# Include{ingressList} + +# Include{security} + + - variable: advancedSecurity + label: "Show Advanced Security Settings" + group: "Security and Permissions" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: securityContext + label: "Security Context" + schema: + additional_attrs: true + type: dict + attrs: + - variable: privileged + label: "Privileged mode" + schema: + type: boolean + default: false + - variable: readOnlyRootFilesystem + label: "ReadOnly Root Filesystem" + schema: + type: boolean + default: false + - variable: allowPrivilegeEscalation + label: "Allow Privilege Escalation" + schema: + type: boolean + default: false + - variable: runAsNonRoot + label: "runAsNonRoot" + schema: + type: boolean + default: false +# Include{securityContextAdvanced} + + - variable: podSecurityContext + group: "Security and Permissions" + label: "Pod Security Context" + schema: + additional_attrs: true + type: dict + attrs: + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: The groupID this App of the user running the application" + schema: + type: int + default: 0 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 +# Include{podSecurityContextAdvanced} + +# Include{resources} + +# Include{advanced} + +# Include{addons} diff --git a/charts/incubator/typecho/templates/common.yaml b/charts/incubator/typecho/templates/common.yaml new file mode 100644 index 00000000000..a6613c2ce21 --- /dev/null +++ b/charts/incubator/typecho/templates/common.yaml @@ -0,0 +1 @@ +{{ include "common.all" . }} diff --git a/charts/incubator/typecho/values.yaml b/charts/incubator/typecho/values.yaml new file mode 100644 index 00000000000..ba6ad484022 --- /dev/null +++ b/charts/incubator/typecho/values.yaml @@ -0,0 +1,59 @@ +image: + repository: joyqi/typecho + tag: 1.2.0-php8.0-apache@sha256:ef5b30b60f0bb51321c51b99514e09b4aa012764d5ae2ce03abf6b6b7584b6e6 + pullPolicy: IfNotPresent + +securityContext: + readOnlyRootFilesystem: false + runAsNonRoot: false + +podSecurityContext: + runAsUser: 0 + runAsGroup: 0 + +env: + TIMEZONE: "{{ .Values.TZ }}" + TYPECHO_INSTALL: 1 + TYPECHO_DB_ADAPTER: "Pdo_Mysql" + TYPECHO_DB_PORT: "3306" + TYPECHO_DB_USER: "{{ .Values.mariadb.mariadbUsername }}" + TYPECHO_DB_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}" + TYPECHO_DB_PREFIX: "typecho_" + TYPECHO_DB_ENGINE: "InnoDB" + TYPECHO_DB_CHARSET: "utf8mb4" + TYPECHO_DB_NEXT: "none" + # User Defined + MEMORY_LIMIT: "100M" + MAX_POST_BODY: "50M" + TYPECHO_SITE_URL: "https://your-domain.com" + TYPECHO_USER_NAME: "typecho" + TYPECHO_USER_PASSWORD: "testtypecho" + TYPECHO_USER_MAIL: "test@truecharts.org" + +envValueFrom: + TYPECHO_DB_HOST: + secretKeyRef: + name: mariadbcreds + key: plainporthost + TYPECHO_DB_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + +service: + main: + ports: + main: + port: 10207 + targetPort: 80 + +persistence: + config: + enabled: true + mountPath: "/app/usr" + +mariadb: + enabled: true + mariadbUsername: typecho + mariadbDatabase: typecho + existingSecret: "mariadbcreds"