Skip to content

Commit 495f123

Browse files
kubermatic-botkubermatic-bot
committed
Syncing with KKP main (4df5aaa0c)
1 parent 3c940ea commit 495f123

File tree

4 files changed

+209
-0
lines changed

4 files changed

+209
-0
lines changed

‎content/kubermatic/main/data/kubermaticConfiguration.ce.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,43 @@ spec:
4949
memory: 150Mi
5050
# Applications contains configuration for Application settings.
5151
applications:
52+
# CatalogManager configures the Application Catalog CatalogManager, which is responsible for managing ApplicationDefinitions
53+
# in the cluster from specified OCI registries.
54+
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
55+
catalogManager:
56+
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
57+
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
58+
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
59+
limit:
60+
# MetadataSelector defines criteria for selecting ApplicationDefinitions based on their metadata attributes.
61+
# For example, to select ApplicationDefinitions with a specific support tier (e.g., 'gold'),
62+
# specify that tier here.
63+
# When multiple tiers are specified, the Application Catalog Manager uses additive logic
64+
# to determine which ApplicationDefinitions to retrieve from the OCI registry.
65+
metadataSelector:
66+
# Tiers specifies the support tiers to filter ApplicationDefinitions.
67+
# ApplicationDefinitions matching any of the specified tiers will be selected.
68+
tiers: null
69+
# NameSelector defines criteria for selecting ApplicationDefinitions by name.
70+
# Each name must correspond to an ApplicationDefinition's `metadata.name` field.
71+
# When multiple names are specified, the Application Catalog Manager uses additive logic
72+
# to retrieve all matching ApplicationDefinitions from the OCI registry.
73+
# Example: Specifying ['nginx', 'cert-manager'] will retrieve only those specific ApplicationDefinitions.
74+
nameSelector: null
75+
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
76+
logLevel: ""
77+
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
78+
# retrieves ApplicationDefinition manifests.
79+
registrySettings:
80+
# Credentials optionally references a secret containing Helm registry authentication credentials.
81+
# Either username/password or registryConfigFile can be specified, but not both.
82+
credentials: null
83+
# RegistryURL specifies the OCI registry URL where ApplicationDefinitions are stored.
84+
# Example: oci://localhost:5000/myrepo
85+
registryURL: ""
86+
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
87+
# Example: v1.0.0
88+
tag: ""
5289
# DefaultApplicationCatalog contains configuration for the default application catalog.
5390
defaultApplicationCatalog:
5491
# Applications is a list of application definition names that should be installed in the master cluster.

‎content/kubermatic/main/data/kubermaticConfiguration.ee.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,43 @@ spec:
4949
memory: 150Mi
5050
# Applications contains configuration for Application settings.
5151
applications:
52+
# CatalogManager configures the Application Catalog CatalogManager, which is responsible for managing ApplicationDefinitions
53+
# in the cluster from specified OCI registries.
54+
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
55+
catalogManager:
56+
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
57+
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
58+
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
59+
limit:
60+
# MetadataSelector defines criteria for selecting ApplicationDefinitions based on their metadata attributes.
61+
# For example, to select ApplicationDefinitions with a specific support tier (e.g., 'gold'),
62+
# specify that tier here.
63+
# When multiple tiers are specified, the Application Catalog Manager uses additive logic
64+
# to determine which ApplicationDefinitions to retrieve from the OCI registry.
65+
metadataSelector:
66+
# Tiers specifies the support tiers to filter ApplicationDefinitions.
67+
# ApplicationDefinitions matching any of the specified tiers will be selected.
68+
tiers: null
69+
# NameSelector defines criteria for selecting ApplicationDefinitions by name.
70+
# Each name must correspond to an ApplicationDefinition's `metadata.name` field.
71+
# When multiple names are specified, the Application Catalog Manager uses additive logic
72+
# to retrieve all matching ApplicationDefinitions from the OCI registry.
73+
# Example: Specifying ['nginx', 'cert-manager'] will retrieve only those specific ApplicationDefinitions.
74+
nameSelector: null
75+
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
76+
logLevel: ""
77+
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
78+
# retrieves ApplicationDefinition manifests.
79+
registrySettings:
80+
# Credentials optionally references a secret containing Helm registry authentication credentials.
81+
# Either username/password or registryConfigFile can be specified, but not both.
82+
credentials: null
83+
# RegistryURL specifies the OCI registry URL where ApplicationDefinitions are stored.
84+
# Example: oci://localhost:5000/myrepo
85+
registryURL: ""
86+
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
87+
# Example: v1.0.0
88+
tag: ""
5289
# DefaultApplicationCatalog contains configuration for the default application catalog.
5390
defaultApplicationCatalog:
5491
# Applications is a list of application definition names that should be installed in the master cluster.

‎content/kubermatic/main/data/kubermaticConfiguration.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,43 @@ spec:
4949
memory: 150Mi
5050
# Applications contains configuration for Application settings.
5151
applications:
52+
# CatalogManager configures the Application Catalog CatalogManager, which is responsible for managing ApplicationDefinitions
53+
# in the cluster from specified OCI registries.
54+
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
55+
catalogManager:
56+
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
57+
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
58+
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
59+
limit:
60+
# MetadataSelector defines criteria for selecting ApplicationDefinitions based on their metadata attributes.
61+
# For example, to select ApplicationDefinitions with a specific support tier (e.g., 'gold'),
62+
# specify that tier here.
63+
# When multiple tiers are specified, the Application Catalog Manager uses additive logic
64+
# to determine which ApplicationDefinitions to retrieve from the OCI registry.
65+
metadataSelector:
66+
# Tiers specifies the support tiers to filter ApplicationDefinitions.
67+
# ApplicationDefinitions matching any of the specified tiers will be selected.
68+
tiers: null
69+
# NameSelector defines criteria for selecting ApplicationDefinitions by name.
70+
# Each name must correspond to an ApplicationDefinition's `metadata.name` field.
71+
# When multiple names are specified, the Application Catalog Manager uses additive logic
72+
# to retrieve all matching ApplicationDefinitions from the OCI registry.
73+
# Example: Specifying ['nginx', 'cert-manager'] will retrieve only those specific ApplicationDefinitions.
74+
nameSelector: null
75+
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
76+
logLevel: ""
77+
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
78+
# retrieves ApplicationDefinition manifests.
79+
registrySettings:
80+
# Credentials optionally references a secret containing Helm registry authentication credentials.
81+
# Either username/password or registryConfigFile can be specified, but not both.
82+
credentials: null
83+
# RegistryURL specifies the OCI registry URL where ApplicationDefinitions are stored.
84+
# Example: oci://localhost:5000/myrepo
85+
registryURL: ""
86+
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
87+
# Example: v1.0.0
88+
tag: ""
5289
# DefaultApplicationCatalog contains configuration for the default application catalog.
5390
defaultApplicationCatalog:
5491
# Applications is a list of application definition names that should be installed in the master cluster.

‎content/kubermatic/main/references/crds/_index.en.md‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,43 @@ _Appears in:_
13211321

13221322

13231323

1324+
### ApplicationCatalogLimit
1325+
1326+
1327+
1328+
1329+
1330+
_Appears in:_
1331+
- [CatalogManagerConfiguration](#catalogmanagerconfiguration)
1332+
1333+
| Field | Description |
1334+
| --- | --- |
1335+
| `metadataSelector` _[ApplicationDefinitionMetadataSelector](#applicationdefinitionmetadataselector)_ | {{< unsafe >}}MetadataSelector defines criteria for selecting ApplicationDefinitions based on their metadata attributes.<br />For example, to select ApplicationDefinitions with a specific support tier (e.g., 'gold'),<br />specify that tier here.<br />When multiple tiers are specified, the Application Catalog Manager uses additive logic<br />to determine which ApplicationDefinitions to retrieve from the OCI registry.{{< /unsafe >}} |
1336+
| `nameSelector` _string array_ | {{< unsafe >}}NameSelector defines criteria for selecting ApplicationDefinitions by name.<br />Each name must correspond to an ApplicationDefinition's `metadata.name` field.<br />When multiple names are specified, the Application Catalog Manager uses additive logic<br />to retrieve all matching ApplicationDefinitions from the OCI registry.<br />Example: Specifying ['nginx', 'cert-manager'] will retrieve only those specific ApplicationDefinitions.{{< /unsafe >}} |
1337+
1338+
1339+
[Back to top](#top)
1340+
1341+
1342+
1343+
### ApplicationDefinitionMetadataSelector
1344+
1345+
1346+
1347+
1348+
1349+
_Appears in:_
1350+
- [ApplicationCatalogLimit](#applicationcataloglimit)
1351+
1352+
| Field | Description |
1353+
| --- | --- |
1354+
| `tiers` _string array_ | {{< unsafe >}}Tiers specifies the support tiers to filter ApplicationDefinitions.<br />ApplicationDefinitions matching any of the specified tiers will be selected.{{< /unsafe >}} |
1355+
1356+
1357+
[Back to top](#top)
1358+
1359+
1360+
13241361
### ApplicationDefinitionsConfiguration
13251362

13261363

@@ -1334,6 +1371,7 @@ _Appears in:_
13341371
| --- | --- |
13351372
| `systemApplications` _[SystemApplicationsSettings](#systemapplicationssettings)_ | {{< unsafe >}}SystemApplications contains configuration for system applications.{{< /unsafe >}} |
13361373
| `defaultApplicationCatalog` _[DefaultApplicationCatalogSettings](#defaultapplicationcatalogsettings)_ | {{< unsafe >}}DefaultApplicationCatalog contains configuration for the default application catalog.{{< /unsafe >}} |
1374+
| `catalogManager` _[CatalogManagerConfiguration](#catalogmanagerconfiguration)_ | {{< unsafe >}}CatalogManager configures the Application Catalog CatalogManager, which is responsible for managing ApplicationDefinitions<br />in the cluster from specified OCI registries.<br />Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.{{< /unsafe >}} |
13371375

13381376

13391377
[Back to top](#top)
@@ -1763,6 +1801,26 @@ _Appears in:_
17631801

17641802

17651803

1804+
### CatalogManagerConfiguration
1805+
1806+
1807+
1808+
1809+
1810+
_Appears in:_
1811+
- [ApplicationDefinitionsConfiguration](#applicationdefinitionsconfiguration)
1812+
1813+
| Field | Description |
1814+
| --- | --- |
1815+
| `logLevel` _string_ | {{< unsafe >}}LogLevel specifies the logging verbosity level for the Application Catalog Manager.{{< /unsafe >}} |
1816+
| `registrySettings` _[RegistrySettings](#registrysettings)_ | {{< unsafe >}}RegistrySettings configures the OCI registry from which the Application Catalog Manager<br />retrieves ApplicationDefinition manifests.{{< /unsafe >}} |
1817+
| `limit` _[ApplicationCatalogLimit](#applicationcataloglimit)_ | {{< unsafe >}}Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.<br />When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.<br />When defined, only ApplicationDefinitions matching the specified criteria are processed.{{< /unsafe >}} |
1818+
1819+
1820+
[Back to top](#top)
1821+
1822+
1823+
17661824
### CleanupOptions
17671825

17681826

@@ -6565,6 +6623,46 @@ _Appears in:_
65656623

65666624

65676625

6626+
### RegistryCredentials
6627+
6628+
6629+
6630+
6631+
6632+
_Appears in:_
6633+
- [RegistrySettings](#registrysettings)
6634+
6635+
| Field | Description |
6636+
| --- | --- |
6637+
| `username` _[SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#secretkeyselector-v1-core)_ | {{< unsafe >}}Username references the secret containing the registry username credential.<br />The referenced Secret must exist in the KKP installation namespace (default: "kubermatic").{{< /unsafe >}} |
6638+
| `password` _[SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#secretkeyselector-v1-core)_ | {{< unsafe >}}Password references the secret containing the registry password credential.<br />The referenced Secret must exist in the KKP installation namespace (default: "kubermatic").{{< /unsafe >}} |
6639+
| `registryConfigFile` _[SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#secretkeyselector-v1-core)_ | {{< unsafe >}}RegistryConfigFile references the secret containing the Docker registry configuration file.<br />The value must be a dockercfg file following the same format as ~/.docker/config.json.<br />The referenced Secret must exist in the KKP installation namespace (default: "kubermatic").{{< /unsafe >}} |
6640+
6641+
6642+
[Back to top](#top)
6643+
6644+
6645+
6646+
### RegistrySettings
6647+
6648+
6649+
6650+
6651+
6652+
_Appears in:_
6653+
- [CatalogManagerConfiguration](#catalogmanagerconfiguration)
6654+
6655+
| Field | Description |
6656+
| --- | --- |
6657+
| `registryURL` _string_ | {{< unsafe >}}RegistryURL specifies the OCI registry URL where ApplicationDefinitions are stored.<br />Example: oci://localhost:5000/myrepo{{< /unsafe >}} |
6658+
| `tag` _string_ | {{< unsafe >}}Tag specifies the version tag for ApplicationDefinitions in the OCI registry.<br />Example: v1.0.0{{< /unsafe >}} |
6659+
| `credentials` _[RegistryCredentials](#registrycredentials)_ | {{< unsafe >}}Credentials optionally references a secret containing Helm registry authentication credentials.<br />Either username/password or registryConfigFile can be specified, but not both.{{< /unsafe >}} |
6660+
6661+
6662+
[Back to top](#top)
6663+
6664+
6665+
65686666
### ResourceDetails
65696667

65706668

0 commit comments

Comments
 (0)