Skip to content

Commit 8df0c35

Browse files
Syncing with KKP main (6694246ae)
1 parent 495f123 commit 8df0c35

File tree

4 files changed

+109
-0
lines changed

4 files changed

+109
-0
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ spec:
5353
# in the cluster from specified OCI registries.
5454
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
5555
catalogManager:
56+
# Image configures the container image for the application-catalog manager.
57+
image:
58+
# Repository is used to override the application-catalog manager image repository.
59+
# The default value is "quay.io/kubermatic/application-catalog-manager"
60+
repository: ""
61+
# Tag is used to override the application-catalog manager image tag.
62+
tag: ""
5663
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
5764
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
5865
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
@@ -74,6 +81,10 @@ spec:
7481
nameSelector: null
7582
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
7683
logLevel: ""
84+
# ReconciliationInterval is the interval at which application-catalog manager reconcile ApplicationDefinitions.
85+
# By default, ApplicationsDefinitions are reconciled at every 10 minutes.
86+
# Setting a value equal to 0 disables the force reconciliation of the default Application Catalog.
87+
reconciliationInterval: 0s
7788
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
7889
# retrieves ApplicationDefinition manifests.
7990
registrySettings:
@@ -86,6 +97,24 @@ spec:
8697
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
8798
# Example: v1.0.0
8899
tag: ""
100+
# Resources describes the requested and maximum allowed CPU/memory usage.
101+
resources:
102+
# Claims lists the names of resources, defined in spec.resourceClaims,
103+
# that are used by this container.
104+
105+
# This is an alpha field and requires enabling the
106+
# DynamicResourceAllocation feature gate.
107+
108+
# This field is immutable. It can only be set for containers.
109+
claims: null
110+
# Limits describes the maximum amount of compute resources allowed.
111+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
112+
limits: null
113+
# Requests describes the minimum amount of compute resources required.
114+
# If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
115+
# otherwise to an implementation-defined value. Requests cannot exceed Limits.
116+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
117+
requests: null
89118
# DefaultApplicationCatalog contains configuration for the default application catalog.
90119
defaultApplicationCatalog:
91120
# 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: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ spec:
5353
# in the cluster from specified OCI registries.
5454
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
5555
catalogManager:
56+
# Image configures the container image for the application-catalog manager.
57+
image:
58+
# Repository is used to override the application-catalog manager image repository.
59+
# The default value is "quay.io/kubermatic/application-catalog-manager"
60+
repository: ""
61+
# Tag is used to override the application-catalog manager image tag.
62+
tag: ""
5663
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
5764
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
5865
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
@@ -74,6 +81,10 @@ spec:
7481
nameSelector: null
7582
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
7683
logLevel: ""
84+
# ReconciliationInterval is the interval at which application-catalog manager reconcile ApplicationDefinitions.
85+
# By default, ApplicationsDefinitions are reconciled at every 10 minutes.
86+
# Setting a value equal to 0 disables the force reconciliation of the default Application Catalog.
87+
reconciliationInterval: 0s
7788
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
7889
# retrieves ApplicationDefinition manifests.
7990
registrySettings:
@@ -86,6 +97,24 @@ spec:
8697
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
8798
# Example: v1.0.0
8899
tag: ""
100+
# Resources describes the requested and maximum allowed CPU/memory usage.
101+
resources:
102+
# Claims lists the names of resources, defined in spec.resourceClaims,
103+
# that are used by this container.
104+
105+
# This is an alpha field and requires enabling the
106+
# DynamicResourceAllocation feature gate.
107+
108+
# This field is immutable. It can only be set for containers.
109+
claims: null
110+
# Limits describes the maximum amount of compute resources allowed.
111+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
112+
limits: null
113+
# Requests describes the minimum amount of compute resources required.
114+
# If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
115+
# otherwise to an implementation-defined value. Requests cannot exceed Limits.
116+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
117+
requests: null
89118
# DefaultApplicationCatalog contains configuration for the default application catalog.
90119
defaultApplicationCatalog:
91120
# Applications is a list of application definition names that should be installed in the master cluster.

content/kubermatic/main/data/kubermaticConfiguration.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ spec:
5353
# in the cluster from specified OCI registries.
5454
# Note: The Application Catalog CatalogManager requires its feature flag to be enabled as it is currently in beta.
5555
catalogManager:
56+
# Image configures the container image for the application-catalog manager.
57+
image:
58+
# Repository is used to override the application-catalog manager image repository.
59+
# The default value is "quay.io/kubermatic/application-catalog-manager"
60+
repository: ""
61+
# Tag is used to override the application-catalog manager image tag.
62+
tag: ""
5663
# Limit defines filtering criteria for ApplicationDefinitions to be reconciled from the OCI registry.
5764
# When undefined, all ApplicationDefinitions from the registry are pulled and reconciled.
5865
# When defined, only ApplicationDefinitions matching the specified criteria are processed.
@@ -74,6 +81,10 @@ spec:
7481
nameSelector: null
7582
# LogLevel specifies the logging verbosity level for the Application Catalog Manager.
7683
logLevel: ""
84+
# ReconciliationInterval is the interval at which application-catalog manager reconcile ApplicationDefinitions.
85+
# By default, ApplicationsDefinitions are reconciled at every 10 minutes.
86+
# Setting a value equal to 0 disables the force reconciliation of the default Application Catalog.
87+
reconciliationInterval: 0s
7788
# RegistrySettings configures the OCI registry from which the Application Catalog Manager
7889
# retrieves ApplicationDefinition manifests.
7990
registrySettings:
@@ -86,6 +97,24 @@ spec:
8697
# Tag specifies the version tag for ApplicationDefinitions in the OCI registry.
8798
# Example: v1.0.0
8899
tag: ""
100+
# Resources describes the requested and maximum allowed CPU/memory usage.
101+
resources:
102+
# Claims lists the names of resources, defined in spec.resourceClaims,
103+
# that are used by this container.
104+
105+
# This is an alpha field and requires enabling the
106+
# DynamicResourceAllocation feature gate.
107+
108+
# This field is immutable. It can only be set for containers.
109+
claims: null
110+
# Limits describes the maximum amount of compute resources allowed.
111+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
112+
limits: null
113+
# Requests describes the minimum amount of compute resources required.
114+
# If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
115+
# otherwise to an implementation-defined value. Requests cannot exceed Limits.
116+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
117+
requests: null
89118
# DefaultApplicationCatalog contains configuration for the default application catalog.
90119
defaultApplicationCatalog:
91120
# 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: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,6 +1815,28 @@ _Appears in:_
18151815
| `logLevel` _string_ | {{< unsafe >}}LogLevel specifies the logging verbosity level for the Application Catalog Manager.{{< /unsafe >}} |
18161816
| `registrySettings` _[RegistrySettings](#registrysettings)_ | {{< unsafe >}}RegistrySettings configures the OCI registry from which the Application Catalog Manager<br />retrieves ApplicationDefinition manifests.{{< /unsafe >}} |
18171817
| `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+
| `image` _[CatalogManagerImageConfiguration](#catalogmanagerimageconfiguration)_ | {{< unsafe >}}Image configures the container image for the application-catalog manager.{{< /unsafe >}} |
1819+
| `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#resourcerequirements-v1-core)_ | {{< unsafe >}}Resources describes the requested and maximum allowed CPU/memory usage.{{< /unsafe >}} |
1820+
| `reconciliationInterval` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#duration-v1-meta)_ | {{< unsafe >}}ReconciliationInterval is the interval at which application-catalog manager reconcile ApplicationDefinitions.<br />By default, ApplicationsDefinitions are reconciled at every 10 minutes.<br />Setting a value equal to 0 disables the force reconciliation of the default Application Catalog.{{< /unsafe >}} |
1821+
1822+
1823+
[Back to top](#top)
1824+
1825+
1826+
1827+
### CatalogManagerImageConfiguration
1828+
1829+
1830+
1831+
CatalogManagerImageConfiguration configures the container image settings.
1832+
1833+
_Appears in:_
1834+
- [CatalogManagerConfiguration](#catalogmanagerconfiguration)
1835+
1836+
| Field | Description |
1837+
| --- | --- |
1838+
| `repository` _string_ | {{< unsafe >}}Repository is used to override the application-catalog manager image repository.<br />The default value is "quay.io/kubermatic/application-catalog-manager"{{< /unsafe >}} |
1839+
| `tag` _string_ | {{< unsafe >}}Tag is used to override the application-catalog manager image tag.{{< /unsafe >}} |
18181840

18191841

18201842
[Back to top](#top)

0 commit comments

Comments
 (0)