Merge pull request #9 from halo-sigs/chore/cleanup-old-configuration

halo-sigs · Sep 4, 2024 · ae36fc6 · ae36fc6
2 parents 261c207 + e7b38de
commit ae36fc6
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 271 deletions.
diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -24,11 +24,11 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.2.0
         with:
-          version: v3.10.0
+          version: v3.15.4
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.1
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/README.md b/README.md
@@ -23,7 +23,6 @@ helm install halo halo/halo
 | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]`  |
 | `global.storageClass`     | Global StorageClass for Persistent Volume(s)    | `""`  |
 
-
 ### Common parameters
 
 | Name                     | Description                                                                                  | Value           |
@@ -39,26 +38,21 @@ helm install halo halo/halo
 | `diagnosticMode.command` | Command to override all containers in the deployment                                         | `["sleep"]`     |
 | `diagnosticMode.args`    | Args to override all containers in the deployment                                            | `["infinity"]`  |
 
-
 ### Halo Image parameters
 
 | Name                | Description                                                                                          | Value          |
 | ------------------- | ---------------------------------------------------------------------------------------------------- | -------------- |
 | `image.registry`    | Halo image registry                                                                                  | `docker.io`    |
 | `image.repository`  | Halo image repository                                                                                | `halohub/halo` |
-| `image.tag`         | Halo image tag (immutable tags are recommended)                                                      | `2.6.1`        |
+| `image.tag`         | Halo image tag (immutable tags are recommended)                                                      | `2.19.0`       |
 | `image.digest`      | Halo image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""`           |
 | `image.pullPolicy`  | Halo image pull policy                                                                               | `IfNotPresent` |
 | `image.pullSecrets` | Halo image pull secrets                                                                              | `[]`           |
 
-
 ### Halo Configuration parameters
 
 | Name                 | Description                                                          | Value                   |
 | -------------------- | -------------------------------------------------------------------- | ----------------------- |
-| `haloUsername`       | Halo username                                                        | `admin`                 |
-| `haloPassword`       | Halo user password                                                   | `""`                    |
-| `existingSecret`     | Name of existing secret containing Halo credentials                  | `""`                    |
 | `haloExternalUrl`    | 外部访问地址，请根据实际需要修改                                                     | `http://localhost:8090` |
 | `haloScheme`         | Scheme to use to generate Halo URLs                                  | `http`                  |
 | `command`            | Override default container command (useful when using custom images) | `[]`                    |
@@ -67,7 +61,6 @@ helm install halo halo/halo
 | `extraEnvVarsCM`     | Name of existing ConfigMap containing extra env vars                 | `""`                    |
 | `extraEnvVarsSecret` | Name of existing Secret containing extra env vars                    | `""`                    |
 
-
 ### Database Parameters
 
 | Name                                          | Description                                                                       | Value        |
@@ -100,7 +93,6 @@ helm install halo halo/halo
 | `externalDatabase.database`                   | External Database database name                                                   | `""`         |
 | `externalDatabase.existingSecret`             | The name of an existing secret with database credentials. Evaluated as a template | `""`         |
 
-
 ### Halo deployment parameters
 
 | Name                                                | Description                                                                                                              | Value           |
@@ -161,7 +153,6 @@ helm install halo halo/halo
 | `customStartupProbe`                                | Custom startupProbe that overrides the default one                                                                       | `{}`            |
 | `lifecycleHooks`                                    | for the Halo container(s) to automate configuration before or after startup                                              | `{}`            |
 
-
 ### Traffic Exposure Parameters
 
 | Name                               | Description                                                                                                                      | Value                    |
@@ -192,7 +183,6 @@ helm install halo halo/halo
 | `ingress.secrets`                  | Custom TLS certificates as secrets                                                                                               | `[]`                     |
 | `ingress.extraRules`               | Additional rules to be covered with this ingress record                                                                          | `[]`                     |
 
-
 ### Persistence Parameters
 
 | Name                                                   | Description                                                                                                   | Value                   |
@@ -216,7 +206,6 @@ helm install halo halo/halo
 | `volumePermissions.resources.requests`                 | The requested resources for the init container                                                                | `{}`                    |
 | `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container                                                                                | `0`                     |
 
-
 ### Other Parameters
 
 | Name                                          | Description                                                            | Value   |
@@ -226,7 +215,6 @@ helm install halo halo/halo
 | `serviceAccount.automountServiceAccountToken` | Allows auto mount of ServiceAccountToken on the serviceAccount created | `true`  |
 | `serviceAccount.annotations`                  | Additional custom annotations for the ServiceAccount                   | `{}`    |
 
-
 ### NetworkPolicy parameters
 
 | Name                                                          | Description                                                                                                                  | Value   |

diff --git a/charts/halo/Chart.yaml b/charts/halo/Chart.yaml
@@ -1,17 +1,18 @@
 annotations:
-  category: CMS
+  category: WebsiteBuilder, CMS, Blog
 apiVersion: v2
-appVersion: 2.6.1
-version: 1.1.0
+appVersion: 2.19.0
+version: 1.2.0
 description: A Helm chart to deploy Halo
-home: https://halo.run
-icon: https://halo.run/logo
+home: https://www.halo.run
+icon: https://www.halo.run/logo
 maintainers:
-  - email: halo-dev@halo.run
-    name: halo-dev
+  - email: hi@halo.run
+    name: Halo Team
 name: halo
 sources:
-  - https://github.com/halo/
+  - https://github.com/halo-sigs/charts
+  - https://github.com/halo-dev/halo
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami
@@ -25,4 +26,4 @@ dependencies:
   - name: mysql
     repository: https://charts.bitnami.com/bitnami
     version: 9.x.x
-    condition: mysql.enabled
+    condition: mysql.enabled
diff --git a/charts/halo/templates/NOTES.txt b/charts/halo/templates/NOTES.txt
@@ -70,11 +70,6 @@ To access your Halo site from outside the cluster follow the steps below:
 
 2. Open a browser and access Halo using the obtained URL.
 
-3. Login with the following credentials below to see your site:
-
-  echo Username: {{ .Values.haloUsername }}
-  echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "common.names.fullname" . }} -o jsonpath="{.data.halo-password}" | base64 -d)
-
 {{- end }}
 
 {{- include "halo.validateValues" . }}

diff --git a/charts/halo/templates/_helpers.tpl b/charts/halo/templates/_helpers.tpl
@@ -156,17 +156,6 @@ Return the R2DBC URL
     {{- printf "r2dbc:pool:%s://%s:%s/%s" (include "halo.databasePlatform" .) (include "halo.databaseHost" .) (include "halo.databasePort" .) (include "halo.databaseName" .) -}}
 {{- end -}}
 
-{{/*
-Return the Halo Secret Name
-*/}}
-{{- define "halo.secretName" -}}
-{{- if .Values.existingSecret }}
-    {{- printf "%s" .Values.existingSecret -}}
-{{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}

diff --git a/charts/halo/templates/deployment.yaml b/charts/halo/templates/deployment.yaml
@@ -143,13 +143,6 @@ spec:
               value: {{ include "halo.databasePlatform" . | quote }}
             - name: HALO_EXTERNAL_URL
               value: {{ .Values.haloExternalUrl | quote }}
-            - name: HALO_SECURITY_INITIALIZER_SUPERADMINUSERNAME
-              value: {{ .Values.haloUsername | quote }}
-            - name: HALO_SECURITY_INITIALIZER_SUPERADMINPASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "halo.secretName" . }}
-                  key: halo-password
             {{- if .Values.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}

diff --git a/charts/halo/templates/secrets.yaml b/charts/halo/templates/secrets.yaml
diff --git a/charts/halo/values.yaml b/charts/halo/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: docker.io
   repository: halohub/halo
-  tag: 2.6.1
+  tag: 2.19.0
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -93,18 +93,6 @@ image:
 ## ref: https://github.com/bitnami/containers/tree/main/bitnami/halo#environment-variables
 ##
 
-## @param haloUsername Halo username
-##
-haloUsername: admin
-## @param haloPassword Halo user password
-## Defaults to a random 10-character alphanumeric string if not set
-##
-haloPassword: ""
-## @param existingSecret Name of existing secret containing Halo credentials
-## NOTE: Must contain key `halo-password`
-## NOTE: When it's set, the `haloPassword` parameter is ignored
-##
-existingSecret: ""
 ## @param haloExternalUrl 外部访问地址，请根据实际需要修改
 ##
 haloExternalUrl: "http://localhost:8090"

diff --git a/package.json b/package.json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@bitnami/readme-generator-for-helm": "2.4.2"
+    "@bitnami/readme-generator-for-helm": "2.6.1"
   }
 }