Skip to content

Commit 7485c19

Browse files
authored
[universal] All charts use cloudpirates prefix (CloudPirates-io#378)
* [common] rename templates from common.* to cloudpirates.* to prevent collisions * [universal]: update all charts to use cloudpirates.* template prefix * fix local path * Fix ghost test
1 parent 1ec9aab commit 7485c19

File tree

15 files changed

+124
-73
lines changed

15 files changed

+124
-73
lines changed

charts/clusterpirate/Chart.lock

Lines changed: 0 additions & 9 deletions
This file was deleted.

charts/clusterpirate/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: clusterpirate
33
description: Client agent for the CloudPirates Managed Observability Platform to connect your Kubernetes cluster to our infrastructure
44
type: application
5-
version: 1.1.4
5+
version: 1.2.0
66
appVersion: "1.0.1"
77
keywords:
88
- kubernetes
@@ -16,10 +16,10 @@ maintainers:
1616
url: https://www.cloudpirates.io
1717
dependencies:
1818
- name: common
19-
version: "1.x.x"
19+
version: "2.x.x"
2020
repository: oci://registry-1.docker.io/cloudpirates
2121
- name: valkey
22-
version: "0.5.0"
22+
version: "0.6.0"
2323
repository: oci://registry-1.docker.io/cloudpirates
2424
condition: valkey.enabled
2525
icon: https://a.storyblok.com/f/143071/512x512/88dc07809a/cluster-pirate-logo.svg

charts/clusterpirate/templates/_helpers.tpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Expand the name of the chart.
33
*/}}
44
{{- define "clusterpirate.name" -}}
5-
{{- include "common.name" . -}}
5+
{{- include "cloudpirates.name" . -}}
66
{{- end }}
77

88
{{/*
@@ -11,35 +11,35 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
1313
{{- define "clusterpirate.fullname" -}}
14-
{{- include "common.fullname" . -}}
14+
{{- include "cloudpirates.fullname" . -}}
1515
{{- end }}
1616

1717
{{/*
1818
Common labels
1919
*/}}
2020
{{- define "clusterpirate.labels" -}}
21-
{{- include "common.labels" . }}
21+
{{- include "cloudpirates.labels" . }}
2222
{{- end }}
2323

2424
{{/*
2525
Common annotations
2626
*/}}
2727
{{- define "clusterpirate.annotations" -}}
28-
{{- include "common.annotations" . }}
28+
{{- include "cloudpirates.annotations" . }}
2929
{{- end }}
3030

3131
{{/*
3232
Return the proper Docker Image Registry Secret Names
3333
*/}}
3434
{{- define "clusterpirate.imagePullSecrets" -}}
35-
{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.image) "context" .) }}
35+
{{ include "cloudpirates.images.renderPullSecrets" (dict "images" (list .Values.image) "context" .) }}
3636
{{- end -}}
3737

3838
{{/*
3939
Selector labels
4040
*/}}
4141
{{- define "clusterpirate.selectorLabels" -}}
42-
{{- include "common.selectorLabels" . -}}
42+
{{- include "cloudpirates.selectorLabels" . -}}
4343
{{- end }}
4444

4545
{{/*
@@ -62,5 +62,5 @@ release: {{ .Release.Name }}
6262
Return the proper ClusterPirate image name
6363
*/}}
6464
{{- define "clusterpirate.image" -}}
65-
{{- include "common.image" (dict "image" .Values.image "global" .Values.global) -}}
65+
{{- include "cloudpirates.image" (dict "image" .Values.image "global" .Values.global) -}}
6666
{{- end }}

charts/clusterpirate/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
containers:
3030
- name: {{ include "clusterpirate.fullname" . }}
3131
image: {{ include "clusterpirate.image" . }}
32-
imagePullPolicy: {{ include "common.imagePullPolicy" (dict "image" .Values.image) }}
32+
imagePullPolicy: {{ include "cloudpirates.imagePullPolicy" (dict "image" .Values.image) }}
3333
resources:
3434
{{ toYaml .Values.deployment.resources | indent 10 }}
3535
{{- if .Values.deployment.probes.livenessProbe.enabled }}

charts/ghost/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: common
33
repository: oci://registry-1.docker.io/cloudpirates
4-
version: 1.1.1
4+
version: 2.0.0
55
- name: mariadb
66
repository: oci://registry-1.docker.io/cloudpirates
7-
version: 0.3.0
8-
digest: sha256:4e89daee4a04df25da46810f73b277003ebff8ca938c308ed55214e9a8893183
9-
generated: "2025-09-30T22:09:51.820397+02:00"
7+
version: 0.4.0
8+
digest: sha256:732fadaa4290d7bcd69b8c7b2b05a75552ac82f188fd0c7b42bf3718bd68c7a1
9+
generated: "2025-10-14T12:59:56.216526+02:00"

charts/ghost/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: ghost
33
description: A simple, powerful publishing platform that allows you to share your stories with the world.
44
type: application
5-
version: 0.2.6
5+
version: 0.3.0
66
appVersion: "6.0.9"
77
keywords:
88
- ghost
@@ -19,10 +19,10 @@ maintainers:
1919
url: https://www.srf.ch
2020
dependencies:
2121
- name: common
22-
version: "1.x.x"
22+
version: "2.x.x"
2323
repository: oci://registry-1.docker.io/cloudpirates
2424
- name: mariadb
25-
version: "0.3.x"
25+
version: "0.4.x"
2626
repository: oci://registry-1.docker.io/cloudpirates
2727
condition: mariadb.enabled
2828
icon: https://a.storyblok.com/f/143071/512x512/3a5c1cb0c5/ghost-logo.png

charts/ghost/ci/test-values.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# CI test values for ghost chart
2+
# Optimized for faster testing in kind clusters and GitHub Actions
3+
4+
image:
5+
# Use IfNotPresent to avoid repeated pulls
6+
pullPolicy: IfNotPresent
7+
# Use simple tag without digest for better caching
8+
tag: "6.3.1"
9+
10+
# Disable ingress for CI tests
11+
ingress:
12+
enabled: false
13+
14+
# Lenient probes for slow CI environments
15+
readinessProbe:
16+
initialDelaySeconds: 10
17+
periodSeconds: 10
18+
timeoutSeconds: 5
19+
failureThreshold: 30
20+
21+
livenessProbe:
22+
initialDelaySeconds: 30
23+
periodSeconds: 30
24+
timeoutSeconds: 5
25+
failureThreshold: 10
26+
27+
# Minimal resources for kind cluster
28+
resources:
29+
limits:
30+
memory: 512Mi
31+
requests:
32+
cpu: 100m
33+
memory: 256Mi
34+
35+
# Disable persistence for faster CI tests
36+
persistence:
37+
enabled: false
38+
39+
# MariaDB configuration for CI
40+
mariadb:
41+
enabled: true
42+
43+
auth:
44+
database: ghost
45+
username: ghost
46+
password: ghost-test-password
47+
rootPassword: root-test-password
48+
49+
image:
50+
pullPolicy: IfNotPresent
51+
52+
primary:
53+
persistence:
54+
enabled: false
55+
56+
resources:
57+
limits:
58+
memory: 256Mi
59+
requests:
60+
cpu: 50m
61+
memory: 128Mi
62+
63+
# Override database connection to use the correct service name
64+
config:
65+
database:
66+
client: "mysql"
67+
connection:
68+
host: "test-ghost-mariadb"
69+
port: 3306
70+
user: "ghost"
71+
password: "ghost-test-password"
72+
database: "ghost"

charts/ghost/templates/_helpers.tpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,56 @@
22
Expand the name of the chart.
33
*/}}
44
{{- define "ghost.name" -}}
5-
{{- include "common.name" . -}}
5+
{{- include "cloudpirates.name" . -}}
66
{{- end }}
77

88
{{/*
99
Create a default fully qualified app name.
1010
*/}}
1111
{{- define "ghost.fullname" -}}
12-
{{- include "common.fullname" . -}}
12+
{{- include "cloudpirates.fullname" . -}}
1313
{{- end }}
1414

1515
{{/*
1616
Create chart name and version as used by the chart label.
1717
*/}}
1818
{{- define "ghost.chart" -}}
19-
{{- include "common.chart" . -}}
19+
{{- include "cloudpirates.chart" . -}}
2020
{{- end }}
2121

2222
{{/*
2323
Common labels
2424
*/}}
2525
{{- define "ghost.labels" -}}
26-
{{- include "common.labels" . }}
26+
{{- include "cloudpirates.labels" . }}
2727
{{- end }}
2828

2929
{{/*
3030
Selector labels
3131
*/}}
3232
{{- define "ghost.selectorLabels" -}}
33-
{{- include "common.selectorLabels" . -}}
33+
{{- include "cloudpirates.selectorLabels" . -}}
3434
{{- end }}
3535

3636
{{/*
3737
Common annotations
3838
*/}}
3939
{{- define "ghost.annotations" -}}
40-
{{- include "common.annotations" . -}}
40+
{{- include "cloudpirates.annotations" . -}}
4141
{{- end }}
4242

4343
{{/*
4444
Return the proper Ghost image name
4545
*/}}
4646
{{- define "ghost.image" -}}
47-
{{- include "common.image" (dict "image" .Values.image "global" .Values.global) -}}
47+
{{- include "cloudpirates.image" (dict "image" .Values.image "global" .Values.global) -}}
4848
{{- end }}
4949

5050
{{/*
5151
Return the proper Docker Image Registry Secret Names
5252
*/}}
5353
{{- define "ghost.imagePullSecrets" -}}
54-
{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.image) "context" .) }}
54+
{{ include "cloudpirates.images.renderPullSecrets" (dict "images" (list .Values.image) "context" .) }}
5555
{{- end -}}
5656

5757
{{/*

charts/ghost/templates/deployment.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
{{ . | nindent 6 }}
3333
{{- end }}
3434
serviceAccountName: {{ include "ghost.serviceAccountName" . }}
35-
securityContext: {{ include "common.renderPodSecurityContext" . | nindent 8 }}
35+
securityContext: {{ include "cloudpirates.renderPodSecurityContext" . | nindent 8 }}
3636
{{- if .Values.mariadb.enabled }}
3737
initContainers:
3838
- name: wait-for-mariadb
@@ -43,10 +43,10 @@ spec:
4343
- >
4444
retries=0;
4545
max_retries=15;
46-
until [ $retries -ge $max_retries ] || mariadb-admin ping -h {{ include "ghost.name" . }}-mariadb
47-
-P {{ .Values.mariadb.service.port }}
48-
-u{{ .Values.mariadb.auth.username }}
49-
-p{{ .Values.mariadb.auth.password }}
46+
until [ $retries -ge $max_retries ] || mariadb-admin ping -h {{ include "ghost.fullname" . }}-mariadb
47+
-P {{ .Values.mariadb.service.port }}
48+
-u{{ .Values.mariadb.auth.username }}
49+
-p{{ .Values.mariadb.auth.password }}
5050
--silent; do
5151
retries=$((retries+1));
5252
echo "Waiting for MariaDB to become ready... (Attempt: $retries/$max_retries)";
@@ -56,13 +56,13 @@ spec:
5656
fi;
5757
sleep 2;
5858
done;
59-
securityContext: {{ include "common.renderContainerSecurityContext" . | nindent 12 }}
59+
securityContext: {{ include "cloudpirates.renderContainerSecurityContext" . | nindent 12 }}
6060
{{- end }}
6161
containers:
6262
- name: {{ .Chart.Name }}
63-
securityContext: {{ include "common.renderContainerSecurityContext" . | nindent 12 }}
63+
securityContext: {{ include "cloudpirates.renderContainerSecurityContext" . | nindent 12 }}
6464
image: {{ include "ghost.image" . | quote }}
65-
imagePullPolicy: {{ include "common.imagePullPolicy" (dict "image" .Values.image) }}
65+
imagePullPolicy: {{ include "cloudpirates.imagePullPolicy" (dict "image" .Values.image) }}
6666
#command: ["tail", "-f", "/dev/null"]
6767
ports:
6868
{{- range .Values.containerPorts }}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{- range .Values.extraObjects }}
22
---
3-
{{- include "common.tplvalues.render" (dict "value" . "context" $) }}
3+
{{- include "cloudpirates.tplvalues.render" (dict "value" . "context" $) }}
44
{{- end }}

0 commit comments

Comments
 (0)