Skip to content

Commit 52c419c

Browse files
committed
Update kamaji to latest version
1 parent 910a9e5 commit 52c419c

29 files changed

Lines changed: 870 additions & 2166 deletions

‎packages/system/kamaji/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ include ../../../scripts/package.mk
66

77
update:
88
rm -rf charts
9-
helm repo add clastix https://clastix.github.io/charts
10-
helm repo update clastix
11-
helm pull clastix/kamaji --untar --untardir charts
9+
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/clastix/kamaji | grep refs/tags/edge- | awk -F'[/^]' 'END{print $$3}') && \
10+
curl -sSL https://github.com/clastix/kamaji/archive/refs/tags/$${tag}.tar.gz | \
11+
tar -xzvf - --strip 1 kamaji-$${tag}/charts && \
12+
sed -i "/^FROM clastix/ s|:.*|:$${tag}|g" images/kamaji/Dockerfile
1213

1314
image:
1415
docker buildx build images/kamaji \
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dependencies:
2+
- name: kamaji-etcd
3+
repository: https://clastix.github.io/charts
4+
version: 0.8.0
5+
digest: sha256:525b0eb2b5bae709d62de9328312d42c54b5219c6df67061de0da79eeca04fb3
6+
generated: "2024-08-25T08:44:24.92211307+02:00"
Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
annotations:
2-
catalog.cattle.io/certified: partner
3-
catalog.cattle.io/display-name: Kamaji
4-
catalog.cattle.io/release-name: kamaji
51
apiVersion: v2
62
appVersion: v1.0.0
73
description: Kamaji is the Hosted Control Plane Manager for Kubernetes.
84
home: https://github.com/clastix/kamaji
95
icon: https://github.com/clastix/kamaji/raw/master/assets/logo-colored.png
10-
kubeVersion: '>=1.21.0-0'
6+
kubeVersion: ">=1.21.0-0"
117
maintainers:
128
139
name: Dario Tranchitella
@@ -21,4 +17,33 @@ name: kamaji
2117
sources:
2218
- https://github.com/clastix/kamaji
2319
type: application
24-
version: 1.0.0
20+
version: 2.0.0
21+
dependencies:
22+
- name: kamaji-etcd
23+
repository: https://clastix.github.io/charts
24+
version: ">=0.7.0"
25+
condition: kamaji-etcd.deploy
26+
annotations:
27+
catalog.cattle.io/certified: partner
28+
catalog.cattle.io/release-name: kamaji
29+
catalog.cattle.io/display-name: Kamaji
30+
artifacthub.io/crds: |
31+
- kind: TenantControlPlane
32+
version: v1alpha1
33+
name: tenantcontrolplanes.kamaji.clastix.io
34+
displayName: TenantControlPlane
35+
description: TenantControlPlane defines the desired state for a Control Plane backed by Kamaji.
36+
- kind: DataStore
37+
version: v1alpha1
38+
name: datastores.kamaji.clastix.io
39+
displayName: DataStore
40+
description: DataStores is holding all the required details to communicate with a Datastore, such as etcd, MySQL, PostgreSQL, and NATS.
41+
artifacthub.io/links: |
42+
- name: CLASTIX
43+
url: https://clastix.io
44+
- name: support
45+
url: https://clastix.io/support
46+
artifacthub.io/operator: "true"
47+
artifacthub.io/operatorCapabilities: "full lifecycle"
48+
artifacthub.io/changes: |
49+
- Using dependency chart `kamaji-etcd` as a default DataStore.

‎packages/system/kamaji/charts/kamaji/README.md‎

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# kamaji
22

3-
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
3+
![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
44

55
Kamaji is the Hosted Control Plane Manager for Kubernetes.
66

@@ -20,6 +20,10 @@ Kamaji is the Hosted Control Plane Manager for Kubernetes.
2020

2121
Kubernetes: `>=1.21.0-0`
2222

23+
| Repository | Name | Version |
24+
|------------|------|---------|
25+
| https://clastix.github.io/charts | kamaji-etcd | >=0.7.0 |
26+
2327
[Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster.
2428
This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`.
2529

@@ -66,59 +70,21 @@ Here the values you can override:
6670
| Key | Type | Default | Description |
6771
|-----|------|---------|-------------|
6872
| affinity | object | `{}` | Kubernetes affinity rules to apply to Kamaji controller pods |
69-
| cfssl.image.repository | string | `"cfssl/cfssl"` | |
70-
| cfssl.image.tag | string | `"latest"` | |
71-
| datastore.basicAuth.passwordSecret.keyPath | string | `nil` | The Secret key where the data is stored. |
72-
| datastore.basicAuth.passwordSecret.name | string | `nil` | The name of the Secret containing the password used to connect to the relational database. |
73-
| datastore.basicAuth.passwordSecret.namespace | string | `nil` | The namespace of the Secret containing the password used to connect to the relational database. |
74-
| datastore.basicAuth.usernameSecret.keyPath | string | `nil` | The Secret key where the data is stored. |
75-
| datastore.basicAuth.usernameSecret.name | string | `nil` | The name of the Secret containing the username used to connect to the relational database. |
76-
| datastore.basicAuth.usernameSecret.namespace | string | `nil` | The namespace of the Secret containing the username used to connect to the relational database. |
77-
| datastore.driver | string | `"etcd"` | (string) The Kamaji Datastore driver, supported: etcd, MySQL, PostgreSQL (defaults=etcd). |
78-
| datastore.enabled | bool | `true` | (bool) Enable the Kamaji Datastore creation (default=true) |
79-
| datastore.endpoints | list | `[]` | (array) List of endpoints of the selected Datastore. When letting the Chart install the etcd datastore, this field is populated automatically. |
80-
| datastore.nameOverride | string | `nil` | The Datastore name override, if empty and enabled=true defaults to `default`, if enabled=false, this is the name of the Datastore to connect to. |
81-
| datastore.tlsConfig.certificateAuthority.certificate.keyPath | string | `nil` | Key of the Secret which contains the content of the certificate. |
82-
| datastore.tlsConfig.certificateAuthority.certificate.name | string | `nil` | Name of the Secret containing the CA required to establish the mandatory SSL/TLS connection to the datastore. |
83-
| datastore.tlsConfig.certificateAuthority.certificate.namespace | string | `nil` | Namespace of the Secret containing the CA required to establish the mandatory SSL/TLS connection to the datastore. |
84-
| datastore.tlsConfig.certificateAuthority.privateKey.keyPath | string | `nil` | Key of the Secret which contains the content of the private key. |
85-
| datastore.tlsConfig.certificateAuthority.privateKey.name | string | `nil` | Name of the Secret containing the CA private key required to establish the mandatory SSL/TLS connection to the datastore. |
86-
| datastore.tlsConfig.certificateAuthority.privateKey.namespace | string | `nil` | Namespace of the Secret containing the CA private key required to establish the mandatory SSL/TLS connection to the datastore. |
87-
| datastore.tlsConfig.clientCertificate.certificate.keyPath | string | `nil` | Key of the Secret which contains the content of the certificate. |
88-
| datastore.tlsConfig.clientCertificate.certificate.name | string | `nil` | Name of the Secret containing the client certificate required to establish the mandatory SSL/TLS connection to the datastore. |
89-
| datastore.tlsConfig.clientCertificate.certificate.namespace | string | `nil` | Namespace of the Secret containing the client certificate required to establish the mandatory SSL/TLS connection to the datastore. |
90-
| datastore.tlsConfig.clientCertificate.privateKey.keyPath | string | `nil` | Key of the Secret which contains the content of the private key. |
91-
| datastore.tlsConfig.clientCertificate.privateKey.name | string | `nil` | Name of the Secret containing the client certificate private key required to establish the mandatory SSL/TLS connection to the datastore. |
92-
| datastore.tlsConfig.clientCertificate.privateKey.namespace | string | `nil` | Namespace of the Secret containing the client certificate private key required to establish the mandatory SSL/TLS connection to the datastore. |
93-
| datastore.tlsConfig.enabled | bool | `true` | |
94-
| etcd.compactionInterval | int | `0` | ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) |
95-
| etcd.deploy | bool | `true` | Install an etcd with enabled multi-tenancy along with Kamaji |
96-
| etcd.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/coreos/etcd","tag":"v3.5.6"}` | Install specific etcd image |
97-
| etcd.livenessProbe | object | `{"failureThreshold":8,"httpGet":{"path":"/health?serializable=true","port":2381,"scheme":"HTTP"},"initialDelaySeconds":10,"periodSeconds":10,"timeoutSeconds":15}` | The livenessProbe for the etcd container |
98-
| etcd.overrides.caSecret.name | string | `"etcd-certs"` | Name of the secret which contains CA's certificate and private key. (default: "etcd-certs") |
99-
| etcd.overrides.caSecret.namespace | string | `"kamaji-system"` | Namespace of the secret which contains CA's certificate and private key. (default: "kamaji-system") |
100-
| etcd.overrides.clientSecret.name | string | `"root-client-certs"` | Name of the secret which contains ETCD client certificates. (default: "root-client-certs") |
101-
| etcd.overrides.clientSecret.namespace | string | `"kamaji-system"` | Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") |
102-
| etcd.overrides.endpoints | object | `{"etcd-0":"etcd-0.etcd.kamaji-system.svc.cluster.local","etcd-1":"etcd-1.etcd.kamaji-system.svc.cluster.local","etcd-2":"etcd-2.etcd.kamaji-system.svc.cluster.local"}` | (map) Dictionary of the endpoints for the etcd cluster's members, key is the name of the etcd server. Don't define the protocol (TLS is automatically inflected), or any port, inflected from .etcd.peerApiPort value. |
103-
| etcd.peerApiPort | int | `2380` | The peer API port which servers are listening to. |
104-
| etcd.persistence.accessModes[0] | string | `"ReadWriteOnce"` | |
105-
| etcd.persistence.customAnnotations | object | `{}` | The custom annotations to add to the PVC |
106-
| etcd.persistence.size | string | `"10Gi"` | |
107-
| etcd.persistence.storageClassName | string | `""` | |
108-
| etcd.port | int | `2379` | The client request port. |
109-
| etcd.serviceAccount.create | bool | `true` | Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) |
110-
| etcd.serviceAccount.name | string | `""` | Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") |
111-
| etcd.tolerations | list | `[]` | (array) Kubernetes affinity rules to apply to Kamaji etcd pods |
73+
| defaultDatastoreName | string | `"default"` | Specify the default DataStore name for the Kamaji instance. |
11274
| extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones |
11375
| fullnameOverride | string | `""` | |
11476
| healthProbeBindAddress | string | `":8081"` | The address the probe endpoint binds to. (default ":8081") |
11577
| image.pullPolicy | string | `"Always"` | |
11678
| image.repository | string | `"clastix/kamaji"` | The container image of the Kamaji controller. |
11779
| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
11880
| imagePullSecrets | list | `[]` | |
81+
| kamaji-etcd.datastore.enabled | bool | `true` | |
82+
| kamaji-etcd.datastore.name | string | `"default"` | |
83+
| kamaji-etcd.deploy | bool | `true` | |
84+
| kamaji-etcd.fullnameOverride | string | `"kamaji-etcd"` | |
11985
| livenessProbe | object | `{"httpGet":{"path":"/healthz","port":"healthcheck"},"initialDelaySeconds":15,"periodSeconds":20}` | The livenessProbe for the controller container |
120-
| loggingDevel.enable | bool | `false` | (string) Development Mode defaults(encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). Production Mode defaults(encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default false) |
121-
| metricsBindAddress | string | `":8080"` | (string) The address the metric endpoint binds to. (default ":8080") |
86+
| loggingDevel.enable | bool | `false` | Development Mode defaults(encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). Production Mode defaults(encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default false) |
87+
| metricsBindAddress | string | `":8080"` | The address the metric endpoint binds to. (default ":8080") |
12288
| nameOverride | string | `""` | |
12389
| nodeSelector | object | `{}` | Kubernetes node selector rules to schedule Kamaji controller |
12490
| podAnnotations | object | `{}` | The annotations to apply to the Kamaji controller pods. |
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
- apiGroups:
2+
- apps
3+
resources:
4+
- deployments
5+
verbs:
6+
- create
7+
- delete
8+
- get
9+
- list
10+
- patch
11+
- update
12+
- watch
13+
- apiGroups:
14+
- batch
15+
resources:
16+
- jobs
17+
verbs:
18+
- create
19+
- delete
20+
- get
21+
- list
22+
- watch
23+
- apiGroups:
24+
- ""
25+
resources:
26+
- configmaps
27+
- secrets
28+
- services
29+
verbs:
30+
- create
31+
- delete
32+
- get
33+
- list
34+
- patch
35+
- update
36+
- watch
37+
- apiGroups:
38+
- kamaji.clastix.io
39+
resources:
40+
- datastores
41+
- tenantcontrolplanes
42+
verbs:
43+
- create
44+
- delete
45+
- get
46+
- list
47+
- patch
48+
- update
49+
- watch
50+
- apiGroups:
51+
- kamaji.clastix.io
52+
resources:
53+
- datastores/status
54+
- tenantcontrolplanes/status
55+
verbs:
56+
- get
57+
- patch
58+
- update
59+
- apiGroups:
60+
- kamaji.clastix.io
61+
resources:
62+
- tenantcontrolplanes/finalizers
63+
verbs:
64+
- update
65+
- apiGroups:
66+
- networking.k8s.io
67+
resources:
68+
- ingresses
69+
verbs:
70+
- create
71+
- delete
72+
- get
73+
- list
74+
- patch
75+
- update
76+
- watch
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
spec:
2+
conversion:
3+
strategy: Webhook
4+
webhook:
5+
clientConfig:
6+
service:
7+
name: kamaji-webhook-service
8+
namespace: kamaji-system
9+
path: /convert
10+
conversionReviewVersions:
11+
- v1
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
- admissionReviewVersions:
2+
- v1
3+
clientConfig:
4+
service:
5+
name: '{{ include "kamaji.webhookServiceName" . }}'
6+
namespace: '{{ .Release.Namespace }}'
7+
path: /mutate-kamaji-clastix-io-v1alpha1-tenantcontrolplane
8+
failurePolicy: Fail
9+
name: mtenantcontrolplane.kb.io
10+
rules:
11+
- apiGroups:
12+
- kamaji.clastix.io
13+
apiVersions:
14+
- v1alpha1
15+
operations:
16+
- CREATE
17+
- UPDATE
18+
resources:
19+
- tenantcontrolplanes
20+
sideEffects: None
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
- admissionReviewVersions:
2+
- v1
3+
clientConfig:
4+
service:
5+
name: '{{ include "kamaji.webhookServiceName" . }}'
6+
namespace: '{{ .Release.Namespace }}'
7+
path: /telemetry
8+
failurePolicy: Ignore
9+
name: telemetry.kamaji.clastix.io
10+
rules:
11+
- apiGroups:
12+
- kamaji.clastix.io
13+
apiVersions:
14+
- v1alpha1
15+
operations:
16+
- CREATE
17+
- UPDATE
18+
- DELETE
19+
resources:
20+
- tenantcontrolplanes
21+
sideEffects: None
22+
- admissionReviewVersions:
23+
- v1
24+
clientConfig:
25+
service:
26+
name: '{{ include "kamaji.webhookServiceName" . }}'
27+
namespace: '{{ .Release.Namespace }}'
28+
path: /validate-kamaji-clastix-io-v1alpha1-datastore
29+
failurePolicy: Fail
30+
name: vdatastore.kb.io
31+
rules:
32+
- apiGroups:
33+
- kamaji.clastix.io
34+
apiVersions:
35+
- v1alpha1
36+
operations:
37+
- CREATE
38+
- UPDATE
39+
- DELETE
40+
resources:
41+
- datastores
42+
sideEffects: None
43+
- admissionReviewVersions:
44+
- v1
45+
clientConfig:
46+
service:
47+
name: '{{ include "kamaji.webhookServiceName" . }}'
48+
namespace: '{{ .Release.Namespace }}'
49+
path: /validate--v1-secret
50+
failurePolicy: Ignore
51+
name: vdatastoresecrets.kb.io
52+
rules:
53+
- apiGroups:
54+
- ""
55+
apiVersions:
56+
- v1
57+
operations:
58+
- DELETE
59+
resources:
60+
- secrets
61+
sideEffects: None
62+
- admissionReviewVersions:
63+
- v1
64+
clientConfig:
65+
service:
66+
name: '{{ include "kamaji.webhookServiceName" . }}'
67+
namespace: '{{ .Release.Namespace }}'
68+
path: /validate-kamaji-clastix-io-v1alpha1-tenantcontrolplane
69+
failurePolicy: Fail
70+
name: vtenantcontrolplane.kb.io
71+
rules:
72+
- apiGroups:
73+
- kamaji.clastix.io
74+
apiVersions:
75+
- v1alpha1
76+
operations:
77+
- CREATE
78+
- UPDATE
79+
resources:
80+
- tenantcontrolplanes
81+
sideEffects: None

0 commit comments

Comments
 (0)