Skip to content

Commit d4fd840

Browse files
NiccoloFeiNiccoloFei
committed
chore: review PG4K LTS
Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent c491742 commit d4fd840

File tree

7 files changed

+42
-78
lines changed

7 files changed

+42
-78
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ ifndef SCHEMA-GEN
1313
$(error "Please, run: helm plugin install https://github.com/karuppiah7890/helm-schema-gen.git first")
1414
endif
1515
helm schema-gen charts/edb-postgres-for-kubernetes/values.yaml > charts/edb-postgres-for-kubernetes/values.schema.json
16+
helm schema-gen charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/values.yaml \
17+
> charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/values.schema.json
1618
helm schema-gen charts/edb-postgres-distributed-for-kubernetes/values.yaml > charts/edb-postgres-distributed-for-kubernetes/values.schema.json

‎charts/edb-postgres-distributed-for-kubernetes/README.md

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ EDB Postgres Distributed for Kubernetes Helm Chart
2323

2424
| Repository | Name | Version |
2525
|------------|------|---------|
26+
| | edb-postgres-for-kubernetes-lts | 0.22.1 |
2627
| https://charts.jetstack.io | cert-manager | 1.16.1 |
2728

2829
## Values
@@ -37,29 +38,27 @@ EDB Postgres Distributed for Kubernetes Helm Chart
3738
| config.create | bool | `true` | Specifies whether the secret should be created |
3839
| config.data.PGD_IMAGE_NAME | string | `"docker.enterprisedb.com/k8s_enterprise_pgd/postgresql-pgd:16.4-5.5.1-1"` | Specifies the location of the pgd image to be used for the operator docker.enterprisedb.com/k8s_standard_pgd/postgresql-pgd:16.4-5.5.1-1 |
3940
| config.data.PGD_PROXY_IMAGE_NAME | string | `"docker.enterprisedb.com/k8s_enterprise_pgd/edb-pgd-proxy:5.5.0"` | Specifies the location of the pgd-proxy image to be used for the operator docker.enterprisedb.com/k8s_standard_pgd/edb-pgd-proxy:5.5.0 |
40-
| config.data | object | `{}` | The content of the configmap/secret, see https://www.enterprisedb.com/docs/postgres_for_kubernetes/latest/operator_conf/#available-options for all the available options. |
41-
| config.data.PULL_SECRET_NAME | string | `"edb-pull-secret"` |
41+
| config.data.PULL_SECRET_NAME | string | `"edb-pull-secret"` | |
4242
| config.name | string | `"pgd-operator-controller-manager-config"` | |
4343
| config.secret | bool | `false` | Specifies whether it should be stored in a secret, instead of a configmap |
4444
| containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":10001,"runAsUser":10001}` | Container Security Context |
45-
| crds.create | bool | `true` | ||
46-
| edb-postgres-for-kubernetes-lts.enable | bool | `true` | |
47-
| edb-postgres-for-kubernetes-lts.image.repository | string | `""` | Overrides the global image repository for pg4k operator. |
48-
| edb-postgres-for-kubernetes-lts.image.imageName | string | `"edb-postgres-for-kubernetes"` | pg4k operator image name in repository|
49-
| edb-postgres-for-kubernetes-lts.image.imagePullSecrets[0].name | string| `"edb-pull-secret"` | |
50-
| edb-postgres-for-kubernetes-lts.config.data.PULL_SECRET_NAME| string| `"edb-pull-secret"` | |
51-
|global.repository| string|`docker.enterprisedb.com/k8s_enterprise_pgd`| specifies the repository name where all the operators are pulled from, image name is not included|
52-
| imagePullSecrets[0].name | string | `"edb-pull-secret"` | |
45+
| crds.create | bool | `true` | |
46+
| edb-postgres-for-kubernetes-lts.crds.create | bool | `true` | |
47+
| edb-postgres-for-kubernetes-lts.enabled | bool | `true` | |
48+
| edb-postgres-for-kubernetes-lts.image.repository | string | `""` | |
5349
| fullnameOverride | string | `""` | |
50+
| global | object | `{"repository":"docker.enterprisedb.com/k8s_enterprise_pgd"}` | Global values |
51+
| global.repository | string | `"docker.enterprisedb.com/k8s_enterprise_pgd"` | Specifies the repository where the operator image to be downloaded from repository: docker.enterprisedb.com/k8s_standard_pgd |
5452
| image.imageCredentials.create | bool | `true` | Specifies if an imagePullSecret should be created |
5553
| image.imageCredentials.name | string | `"edb-pull-secret"` | |
5654
| image.imageCredentials.password | string | `""` | |
5755
| image.imageCredentials.registry | string | `"docker.enterprisedb.com"` | |
58-
| image.imageCredentials.username | string | `""` | |
59-
| image.repository | string | `""` | Overrides the global image repository for pg4k-pgd operator.|
60-
| image.imageName | string | `"pg4k-pgd"` | pg4k-pgd operator image name in repository|
61-
| image.pullPolicy | string | `"IfNotPresent"` | |
62-
| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
56+
| image.imageCredentials.username | string | `""` | |
57+
| image.imageName | string | `"pg4k-pgd"` | Specifies the name of the operator image to be pulled from repository |
58+
| image.imagePullPolicy | string | `"IfNotPresent"` | |
59+
| image.imageTag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
60+
| image.repository | string | `""` | |
61+
| imagePullSecrets[0].name | string | `"edb-pull-secret"` | |
6362
| managerConfig.data.health.healthProbeBindAddress | string | `":9443"` | |
6463
| managerConfig.data.leaderElection.enabled | bool | `true` | |
6564
| managerConfig.data.leaderElection.resourceName | string | `"e72f3162.k8s.enterprisedb.io"` | |
@@ -89,17 +88,3 @@ EDB Postgres Distributed for Kubernetes Helm Chart
8988
| webhook.validating.create | bool | `true` | |
9089
| webhook.validating.failurePolicy | string | `"Fail"` | |
9190

92-
## Values for PG4K operator settings
93-
94-
We can use prefix `edb-postgres-for-kubernetes-lts.` to specific the configuration for PG4K values if you want to overwrite the default one.
95-
For a list of PG4K operator configuration values, please see [PG4K Values doc](https://github.com/EnterpriseDB/edb-postgres-for-kubernetes-charts/blob/main/charts/edb-postgres-for-kubernetes/README.md#values)
96-
97-
edb-postgres-for-kubernetes-lts:
98-
enabled: true
99-
image:
100-
repository: docker.enterprisedb.com/k8s_enterprise_pgd/edb-postgres-for-kubernetes
101-
imagePullSecrets:
102-
- name: edb-pull-secret
103-
config:
104-
data:
105-
PULL_SECRET_NAME: edb-pull-secret

‎charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
apiVersion: v2
1616
name: edb-postgres-for-kubernetes-lts
17-
description: EDB Postgres for Kubernetes lts release Helm Chart
17+
description: EDB Postgres for Kubernetes LTS release Helm Chart
1818
icon: https://www.enterprisedb.com/themes/custom/edb_bootstrap_sass/edb-logo-disc-dark-2.svg
1919
type: application
2020
version: "0.22.1"

‎charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/_helpers.tpl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,6 @@ namespace scope or clusterwide
226226
- get
227227
- patch
228228
- update
229-
- apiGroups:
230-
- postgresql.k8s.enterprisedb.io
231-
resources:
232-
- imagecatalogs
233-
verbs:
234-
- get
235-
- list
236-
- watch
237229
- apiGroups:
238230
- postgresql.k8s.enterprisedb.io
239231
resources:
@@ -303,12 +295,4 @@ Define the set of rules that must be applied clusterwide
303295
- get
304296
- list
305297
- update
306-
- apiGroups:
307-
- postgresql.k8s.enterprisedb.io
308-
resources:
309-
- clusterimagecatalogs
310-
verbs:
311-
- get
312-
- list
313-
- watch
314298
{{- end }}

‎charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/values.schema.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@
115115
}
116116
}
117117
},
118+
"imageName": {
119+
"type": "string"
120+
},
118121
"pullPolicy": {
119122
"type": "string"
120123
},
@@ -137,6 +140,9 @@
137140
}
138141
}
139142
},
143+
"installCRDs": {
144+
"type": "boolean"
145+
},
140146
"monitoring": {
141147
"type": "object",
142148
"properties": {

‎charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
replicaCount: 1
2020

2121
image:
22-
# -- Specifies the repository where the operator image to be downloaded from
22+
# -- Specifies the repository where the operator image should be downloaded from
2323
# docker.enterprisedb.com/k8s_standard_pgd
2424
repository: docker.enterprisedb.com/k8s_enterprise_pgd
25-
# The name of the operator image to be pulled from repository
25+
# The name of the operator image to be pulled from the repository
2626
imageName: edb-postgres-for-kubernetes
2727
# -- Overrides the image tag whose default is the chart appVersion.
2828
tag: ""

‎charts/edb-postgres-distributed-for-kubernetes/values.schema.json

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,11 @@
8989
"edb-postgres-for-kubernetes-lts": {
9090
"type": "object",
9191
"properties": {
92-
"config": {
92+
"crds": {
9393
"type": "object",
9494
"properties": {
95-
"data": {
96-
"type": "object",
97-
"properties": {
98-
"PULL_SECRET_NAME": {
99-
"type": "string"
100-
}
101-
}
95+
"create": {
96+
"type": "boolean"
10297
}
10398
}
10499
},
@@ -112,31 +107,20 @@
112107
"type": "string"
113108
}
114109
}
115-
},
116-
"imagePullSecrets": {
117-
"type": "array",
118-
"items": {
119-
"type": "object",
120-
"properties": {
121-
"name": {
122-
"type": "string"
123-
}
124-
}
125-
}
126-
},
127-
"crd": {
128-
"type": "object",
129-
"properties": {
130-
"create": {
131-
"type": "boolean"
132-
}
133-
}
134110
}
135111
}
136112
},
137113
"fullnameOverride": {
138114
"type": "string"
139115
},
116+
"global": {
117+
"type": "object",
118+
"properties": {
119+
"repository": {
120+
"type": "string"
121+
}
122+
}
123+
},
140124
"image": {
141125
"type": "object",
142126
"properties": {
@@ -160,13 +144,16 @@
160144
}
161145
}
162146
},
163-
"pullPolicy": {
147+
"imageName": {
164148
"type": "string"
165149
},
166-
"repository": {
150+
"imagePullPolicy": {
167151
"type": "string"
168152
},
169-
"tag": {
153+
"imageTag": {
154+
"type": "string"
155+
},
156+
"repository": {
170157
"type": "string"
171158
}
172159
}

0 commit comments

Comments
 (0)