Merge pull request #7 from kyrbrbik/main

Add extra containers for postiz

.github/workflows/helm-chart-ci-cd.yaml

@@ -5,12 +5,12 @@ on:
     branches: [ main ]
     paths:
       - 'charts/**'
-      - '.github/workflows/helm-chart-ci-cd.yml'
+      - '.github/workflows/helm-chart-ci-cd.yaml'
   pull_request:
     branches: [ main ]
     paths:
       - 'charts/**'
-      - '.github/workflows/helm-chart-ci-cd.yml'
+      - '.github/workflows/helm-chart-ci-cd.yaml'
   release:
     types: [created]
 
@@ -32,6 +32,10 @@ jobs:
         with:
           version: v3.14.4
 
+      - name: Install Chart deps
+        run: |
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

README.md

@@ -50,6 +50,15 @@ The following table lists the configurable parameters of the Postiz chart and th
 | `postgresql.auth.database` | PostgreSQL database   | `postiz`       |
 | `redis.enabled`          | Deploy Redis            | `true`         |
 | `redis.auth.password`    | Redis password          | `postiz-redis-password` |
+| `ingress.enabled`        | Enable ingress controller resource    | `false`                  |
+| `ingress.className`      | IngressClass that will be be used     | `""`                     |
+| `ingress.annotations`    | Ingress annotations                   | `{}`                     |
+| `ingress.hosts`          | Ingress hostnames                     | `[]`                     |
+| `ingress.tls`            | Ingress TLS configuration             | `[]`                     |
+| `ingress.path`           | Path within the host                  | `/`                      |
+| `ingress.pathType`       | Ingress path type                     | `ImplementationSpecific` |
+| `extraVolumes`           | Additional volumes to mount           | `[{"name": "uploads-volume", "emptyDir": {}}]` |
+| `extraVolumeMounts`      | Additional volume mounts to use       | `[{"name": "uploads-volume", "mountPath": "/uploads"}]` |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
@@ -61,13 +70,26 @@ $ helm install postiz-app \
 
 The above command sets the PostgreSQL password to `secretpassword`.
 
-Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+Alternatively, you can use a YAML file to specify the values while installing the chart. Create a file called `custom-values.yaml` (or any name you prefer) and specify your values:
 
-```bash
+```yaml
-$ helm install postiz-app -f values.yaml postiz/postiz
+postgresql:
+  auth:
+    password: secretpassword
+ingress:
+  enabled: true
+  hosts:
+    - host: postiz.example.com
 ```
 
-> **Tip**: You can use the default [values.yaml](values.yaml)
+Then, you can install the chart using the `-f`  flag:
+
+```bash
+$ helm install postiz-app -f custom-values.yaml postiz/postiz
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml) as a starting point for your custom configuration.
+
 
 ## Persistence
 
@@ -95,4 +117,4 @@ We welcome contributions to this chart. Please read our [Contributing Guide](CON
 
 ## License
 
-This chart is licensed under the Apache License 2.0. See the [LICENSE](LICENSE) file for details.
+This chart is licensed under the Apache License 2.0. See the [LICENSE](LICENSE) file for details.

charts/postiz/Chart.yaml

@@ -1,9 +1,16 @@
 apiVersion: v2
 name: postiz-app
-description: A Social Media Scheduling App 
+description: A Social Media Scheduling App
 type: application
-version: 1.0.1
+version: 1.0.5
 appVersion: "1.3.0"
+maintainers:
+  - name: jonathan-irvin
+    email: offendingcommit@gmail.com
+    url: https://linktr.ee/offendingcommit
+  - name: jamesread
+    email: contact@jread.com
+    url: http://jread.com
 keywords:
   - social media
   - marketing

charts/postiz/templates/postiz-deployment.yaml

@@ -35,8 +35,15 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 3000
+              containerPort: 5000
               protocol: TCP
+          volumeMounts:
+            {{- if .Values.extraVolumeMounts }}
+            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+            {{- else }}
+            - name: uploads-volume
+              mountPath: /uploads
+            {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "postiz.fullname" . }}-config
@@ -44,6 +51,9 @@ spec:
                 name: {{ include "postiz.fullname" . }}-secrets
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+        {{- if .Values.extraContainers }}
+        {{- toYaml .Values.extraContainers | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -55,4 +65,11 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
+      volumes:
+        {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- else }}
+        - name: uploads-volume
+          emptyDir: {}
+        {{- end }}

charts/postiz/templates/postiz-ingress.yaml

@@ -0,0 +1,44 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "postiz.fullname" . }}
+  labels:
+    {{- include "postiz.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "postiz.fullname" $ }}
+                port: 
+                  number: {{ .port }}
+          {{- end }}
+    {{- end }}
+  {{- if .Values.ingress.extraRules }}
+    {{- toYaml .Values.ingress.extraRules | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/postiz/templates/postiz-service.yaml

@@ -11,5 +11,8 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    {{- if .Values.service.additionalPorts }}
+    {{- toYaml .Values.service.additionalPorts | nindent 4 }}
+    {{- end }}
   selector:
-    {{- include "postiz.selectorLabels" . | nindent 4 }}
+    {{- include "postiz.selectorLabels" . | nindent 4 }}

charts/postiz/templates/postiz-serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "postiz.serviceAccountName" . }}
+  labels:
+    {{- include "postiz.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/postiz/values.yaml

@@ -23,20 +23,33 @@ securityContext: {}
 service:
   type: ClusterIP
   port: 80
+  additionalPorts: []
 
 ingress:
-  enabled: false
+  enabled: false  # Disabled by default
   className: ""
   annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
   hosts:
     - host: chart-example.local
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
+          port: 80
   tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+  extraRules: []
 
 resources: {}
 
+extraContainers: []
+
+extraVolumes: []
+extraVolumeMounts: []
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -98,4 +111,4 @@ secrets:
   CLOUDFLARE_ACCESS_KEY: ""
   CLOUDFLARE_SECRET_ACCESS_KEY: ""
   CLOUDFLARE_BUCKETNAME: ""
-  CLOUDFLARE_BUCKET_URL: ""
+  CLOUDFLARE_BUCKET_URL: ""