Skip to content

Commit bb9d333

Browse files
committed
[kubernetes] remove useCustomSecretForPatchContainerd option, enable it by default
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 4e41c13 commit bb9d333

6 files changed

Lines changed: 9 additions & 18 deletions

File tree

‎packages/apps/kubernetes/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.24.1
19+
version: 0.24.2
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/kubernetes/README.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,12 @@ See the reference for components utilized in this service:
8181
8282
### Common Parameters
8383
84-
| Name | Description | Value |
85-
| ----------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------ |
86-
| `host` | Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty. | `""` |
87-
| `controlPlane.replicas` | Number of replicas for Kubernetes control-plane components. | `2` |
88-
| `storageClass` | StorageClass used to store user data. | `replicated` |
89-
| `useCustomSecretForPatchContainerd` | if true, for patch containerd will be used secret: {{ .Release.Name }}-patch-containerd | `false` |
90-
| `nodeGroups` | nodeGroups configuration | `{}` |
84+
| Name | Description | Value |
85+
| ----------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------ |
86+
| `host` | Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty. | `""` |
87+
| `controlPlane.replicas` | Number of replicas for Kubernetes control-plane components. | `2` |
88+
| `storageClass` | StorageClass used to store user data. | `replicated` |
89+
| `nodeGroups` | nodeGroups configuration | `{}` |
9190
9291
### Cluster Addons
9392

‎packages/apps/kubernetes/templates/copy-patch-containerd.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if not .Values.useCustomSecretForPatchContainerd }}
21
{{- $sourceSecret := lookup "v1" "Secret" "cozy-system" "patch-containerd" }}
32
{{- if $sourceSecret }}
43
apiVersion: v1
@@ -12,4 +11,3 @@ data:
1211
{{ printf "%s: %s" $key ($value | quote) | indent 2 }}
1312
{{- end }}
1413
{{- end }}
15-
{{- end }}

‎packages/apps/kubernetes/values.schema.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@
127127
"description": "StorageClass used to store user data.",
128128
"default": "replicated"
129129
},
130-
"useCustomSecretForPatchContainerd": {
131-
"type": "boolean",
132-
"description": "if true, for patch containerd will be used secret: {{ .Release.Name }}-patch-containerd",
133-
"default": false
134-
},
135130
"addons": {
136131
"type": "object",
137132
"properties": {

‎packages/apps/kubernetes/values.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
## @param host Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty.
44
## @param controlPlane.replicas Number of replicas for Kubernetes control-plane components.
55
## @param storageClass StorageClass used to store user data.
6-
## @param useCustomSecretForPatchContainerd if true, for patch containerd will be used secret: {{ .Release.Name }}-patch-containerd
76
##
87
host: ""
98
storageClass: replicated
10-
useCustomSecretForPatchContainerd: false
119

1210
## @param nodeGroups [object] nodeGroups configuration
1311
##

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ kafka 0.6.0 6130f43d
4646
kafka 0.6.1 632224a3
4747
kafka 0.7.0 HEAD
4848
kubernetes 0.24.0 62cb694d
49-
kubernetes 0.24.1 HEAD
49+
kubernetes 0.24.1 6358fd7a
50+
kubernetes 0.24.2 HEAD
5051
mysql 0.1.0 263e47be
5152
mysql 0.2.0 c24a103f
5253
mysql 0.3.0 53f2365e

0 commit comments

Comments
 (0)