diff --git a/assets/bitnami/kafka-21.4.1.tgz b/assets/bitnami/kafka-21.4.1.tgz new file mode 100644 index 000000000..e77d6d47c Binary files /dev/null and b/assets/bitnami/kafka-21.4.1.tgz differ diff --git a/assets/bitnami/mariadb-11.5.5.tgz b/assets/bitnami/mariadb-11.5.5.tgz new file mode 100644 index 000000000..8ce5b115b Binary files /dev/null and b/assets/bitnami/mariadb-11.5.5.tgz differ diff --git a/assets/bitnami/mysql-9.7.0.tgz b/assets/bitnami/mysql-9.7.0.tgz new file mode 100644 index 000000000..41deb77db Binary files /dev/null and b/assets/bitnami/mysql-9.7.0.tgz differ diff --git a/assets/bitnami/postgresql-12.2.6.tgz b/assets/bitnami/postgresql-12.2.6.tgz new file mode 100644 index 000000000..f0d7b538a Binary files /dev/null and b/assets/bitnami/postgresql-12.2.6.tgz differ diff --git a/assets/bitnami/redis-17.9.0.tgz b/assets/bitnami/redis-17.9.0.tgz new file mode 100644 index 000000000..d5c420648 Binary files /dev/null and b/assets/bitnami/redis-17.9.0.tgz differ diff --git a/assets/bitnami/tomcat-10.6.0.tgz b/assets/bitnami/tomcat-10.6.0.tgz new file mode 100644 index 000000000..d6a23b793 Binary files /dev/null and b/assets/bitnami/tomcat-10.6.0.tgz differ diff --git a/assets/bitnami/wordpress-15.2.57.tgz b/assets/bitnami/wordpress-15.2.57.tgz new file mode 100644 index 000000000..3c19f6b76 Binary files /dev/null and b/assets/bitnami/wordpress-15.2.57.tgz differ diff --git a/assets/crate/crate-operator-2.25.0.tgz b/assets/crate/crate-operator-2.25.0.tgz new file mode 100644 index 000000000..26d87319a Binary files /dev/null and b/assets/crate/crate-operator-2.25.0.tgz differ diff --git a/assets/datadog/datadog-3.21.0.tgz b/assets/datadog/datadog-3.21.0.tgz new file mode 100644 index 000000000..eb59bce1a Binary files /dev/null and b/assets/datadog/datadog-3.21.0.tgz differ diff --git a/assets/digitalis/vals-operator-0.7.2.tgz b/assets/digitalis/vals-operator-0.7.2.tgz new file mode 100644 index 000000000..c394e59c4 Binary files /dev/null and b/assets/digitalis/vals-operator-0.7.2.tgz differ diff --git a/assets/dynatrace/dynatrace-operator-0.10.4.tgz b/assets/dynatrace/dynatrace-operator-0.10.4.tgz new file mode 100644 index 000000000..5730264ee Binary files /dev/null and b/assets/dynatrace/dynatrace-operator-0.10.4.tgz differ diff --git a/assets/gitlab/gitlab-6.10.0.tgz b/assets/gitlab/gitlab-6.10.0.tgz new file mode 100644 index 000000000..84a9e1e7e Binary files /dev/null and b/assets/gitlab/gitlab-6.10.0.tgz differ diff --git a/assets/kubemq/kubemq-cluster-2.3.7.tgz b/assets/kubemq/kubemq-cluster-2.3.7.tgz new file mode 100644 index 000000000..bb70a1734 Binary files /dev/null and b/assets/kubemq/kubemq-cluster-2.3.7.tgz differ diff --git a/assets/kubemq/kubemq-controller-1.9.3.tgz b/assets/kubemq/kubemq-controller-1.9.3.tgz new file mode 100644 index 000000000..e06367b21 Binary files /dev/null and b/assets/kubemq/kubemq-controller-1.9.3.tgz differ diff --git a/assets/kubemq/kubemq-crds-2.3.7.tgz b/assets/kubemq/kubemq-crds-2.3.7.tgz new file mode 100644 index 000000000..68ea2835d Binary files /dev/null and b/assets/kubemq/kubemq-crds-2.3.7.tgz differ diff --git a/assets/new-relic/nri-bundle-5.0.6.tgz b/assets/new-relic/nri-bundle-5.0.6.tgz new file mode 100644 index 000000000..b3c8e4d4c Binary files /dev/null and b/assets/new-relic/nri-bundle-5.0.6.tgz differ diff --git a/assets/speedscale/speedscale-operator-1.2.27.tgz b/assets/speedscale/speedscale-operator-1.2.27.tgz new file mode 100644 index 000000000..65189a0a8 Binary files /dev/null and b/assets/speedscale/speedscale-operator-1.2.27.tgz differ diff --git a/assets/sysdig/sysdig-1.15.80.tgz b/assets/sysdig/sysdig-1.15.80.tgz new file mode 100644 index 000000000..c7c8b48fc Binary files /dev/null and b/assets/sysdig/sysdig-1.15.80.tgz differ diff --git a/charts/bitnami/kafka/Chart.lock b/charts/bitnami/kafka/Chart.lock index 55c7c7496..7f620c052 100644 --- a/charts/bitnami/kafka/Chart.lock +++ b/charts/bitnami/kafka/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: zookeeper repository: https://charts.bitnami.com/bitnami - version: 11.1.3 + version: 11.1.5 - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.3 -digest: sha256:9b4839a665633a42ed9baebd57470791a91b377183962a91c33d505985aa790b -generated: "2023-02-22T15:02:37.191542654Z" + version: 2.2.4 +digest: sha256:a9cc33255fae632899c931e89126a7a0e9cec72fa758d499dd75f1ab752d1b0e +generated: "2023-03-22T03:12:46.460010968Z" diff --git a/charts/bitnami/kafka/Chart.yaml b/charts/bitnami/kafka/Chart.yaml index 28a59214e..1f75cb4ae 100644 --- a/charts/bitnami/kafka/Chart.yaml +++ b/charts/bitnami/kafka/Chart.yaml @@ -35,4 +35,4 @@ name: kafka sources: - https://github.com/bitnami/containers/tree/main/bitnami/kafka - https://kafka.apache.org/ -version: 21.4.0 +version: 21.4.1 diff --git a/charts/bitnami/kafka/README.md b/charts/bitnami/kafka/README.md index 63a31a4d2..8a931b317 100644 --- a/charts/bitnami/kafka/README.md +++ b/charts/bitnami/kafka/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | | `image.registry` | Kafka image registry | `docker.io` | | `image.repository` | Kafka image repository | `bitnami/kafka` | -| `image.tag` | Kafka image tag (immutable tags are recommended) | `3.4.0-debian-11-r6` | +| `image.tag` | Kafka image tag (immutable tags are recommended) | `3.4.0-debian-11-r12` | | `image.digest` | Kafka image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | Kafka image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -232,55 +232,55 @@ The command removes all the Kubernetes components associated with the chart and ### Traffic Exposure parameters -| Name | Description | Value | -| ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | -| `service.type` | Kubernetes Service type | `ClusterIP` | -| `service.ports.client` | Kafka svc port for client connections | `9092` | -| `service.ports.internal` | Kafka svc port for inter-broker connections | `9093` | -| `service.ports.external` | Kafka svc port for external connections | `9094` | -| `service.nodePorts.client` | Node port for the Kafka client connections | `""` | -| `service.nodePorts.external` | Node port for the Kafka external connections | `""` | -| `service.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | -| `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | -| `service.clusterIP` | Kafka service Cluster IP | `""` | -| `service.loadBalancerIP` | Kafka service Load Balancer IP | `""` | -| `service.loadBalancerSourceRanges` | Kafka service Load Balancer sources | `[]` | -| `service.externalTrafficPolicy` | Kafka service external traffic policy | `Cluster` | -| `service.annotations` | Additional custom annotations for Kafka service | `{}` | -| `service.headless.publishNotReadyAddresses` | Indicates that any agent which deals with endpoints for this Service should disregard any indications of ready/not-ready | `false` | -| `service.headless.annotations` | Annotations for the headless service. | `{}` | -| `service.headless.labels` | Labels for the headless service. | `{}` | -| `service.extraPorts` | Extra ports to expose in the Kafka service (normally used with the `sidecar` value) | `[]` | -| `externalAccess.enabled` | Enable Kubernetes external cluster access to Kafka brokers | `false` | -| `externalAccess.autoDiscovery.enabled` | Enable using an init container to auto-detect external IPs/ports by querying the K8s API | `false` | -| `externalAccess.autoDiscovery.image.registry` | Init container auto-discovery image registry | `docker.io` | -| `externalAccess.autoDiscovery.image.repository` | Init container auto-discovery image repository | `bitnami/kubectl` | -| `externalAccess.autoDiscovery.image.tag` | Init container auto-discovery image tag (immutable tags are recommended) | `1.25.6-debian-11-r14` | -| `externalAccess.autoDiscovery.image.digest` | Kubectl image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `externalAccess.autoDiscovery.image.pullPolicy` | Init container auto-discovery image pull policy | `IfNotPresent` | -| `externalAccess.autoDiscovery.image.pullSecrets` | Init container auto-discovery image pull secrets | `[]` | -| `externalAccess.autoDiscovery.resources.limits` | The resources limits for the auto-discovery init container | `{}` | -| `externalAccess.autoDiscovery.resources.requests` | The requested resources for the auto-discovery init container | `{}` | -| `externalAccess.service.type` | Kubernetes Service type for external access. It can be NodePort, LoadBalancer or ClusterIP | `LoadBalancer` | -| `externalAccess.service.ports.external` | Kafka port used for external access when service type is LoadBalancer | `9094` | -| `externalAccess.service.loadBalancerIPs` | Array of load balancer IPs for each Kafka broker. Length must be the same as replicaCount | `[]` | -| `externalAccess.service.loadBalancerNames` | Array of load balancer Names for each Kafka broker. Length must be the same as replicaCount | `[]` | -| `externalAccess.service.loadBalancerAnnotations` | Array of load balancer annotations for each Kafka broker. Length must be the same as replicaCount | `[]` | -| `externalAccess.service.loadBalancerSourceRanges` | Address(es) that are allowed when service is LoadBalancer | `[]` | -| `externalAccess.service.nodePorts` | Array of node ports used for each Kafka broker. Length must be the same as replicaCount | `[]` | -| `externalAccess.service.externalIPs` | Use distinct service host IPs to configure Kafka external listener when service type is NodePort. Length must be the same as replicaCount | `[]` | -| `externalAccess.service.useHostIPs` | Use service host IPs to configure Kafka external listener when service type is NodePort | `false` | -| `externalAccess.service.usePodIPs` | using the MY_POD_IP address for external access. | `false` | -| `externalAccess.service.domain` | Domain or external ip used to configure Kafka external listener when service type is NodePort or ClusterIP | `""` | -| `externalAccess.service.publishNotReadyAddresses` | Indicates that any agent which deals with endpoints for this Service should disregard any indications of ready/not-ready | `false` | -| `externalAccess.service.labels` | Service labels for external access | `{}` | -| `externalAccess.service.annotations` | Service annotations for external access | `{}` | -| `externalAccess.service.extraPorts` | Extra ports to expose in the Kafka external service | `[]` | -| `networkPolicy.enabled` | Specifies whether a NetworkPolicy should be created | `false` | -| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | -| `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed | `{}` | -| `networkPolicy.externalAccess.from` | customize the from section for External Access on tcp-external port | `[]` | -| `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | +| Name | Description | Value | +| ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | +| `service.type` | Kubernetes Service type | `ClusterIP` | +| `service.ports.client` | Kafka svc port for client connections | `9092` | +| `service.ports.internal` | Kafka svc port for inter-broker connections | `9093` | +| `service.ports.external` | Kafka svc port for external connections | `9094` | +| `service.nodePorts.client` | Node port for the Kafka client connections | `""` | +| `service.nodePorts.external` | Node port for the Kafka external connections | `""` | +| `service.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | +| `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `service.clusterIP` | Kafka service Cluster IP | `""` | +| `service.loadBalancerIP` | Kafka service Load Balancer IP | `""` | +| `service.loadBalancerSourceRanges` | Kafka service Load Balancer sources | `[]` | +| `service.externalTrafficPolicy` | Kafka service external traffic policy | `Cluster` | +| `service.annotations` | Additional custom annotations for Kafka service | `{}` | +| `service.headless.publishNotReadyAddresses` | Indicates that any agent which deals with endpoints for this Service should disregard any indications of ready/not-ready | `false` | +| `service.headless.annotations` | Annotations for the headless service. | `{}` | +| `service.headless.labels` | Labels for the headless service. | `{}` | +| `service.extraPorts` | Extra ports to expose in the Kafka service (normally used with the `sidecar` value) | `[]` | +| `externalAccess.enabled` | Enable Kubernetes external cluster access to Kafka brokers | `false` | +| `externalAccess.autoDiscovery.enabled` | Enable using an init container to auto-detect external IPs/ports by querying the K8s API | `false` | +| `externalAccess.autoDiscovery.image.registry` | Init container auto-discovery image registry | `docker.io` | +| `externalAccess.autoDiscovery.image.repository` | Init container auto-discovery image repository | `bitnami/kubectl` | +| `externalAccess.autoDiscovery.image.tag` | Init container auto-discovery image tag (immutable tags are recommended) | `1.25.7-debian-11-r4` | +| `externalAccess.autoDiscovery.image.digest` | Kubectl image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `externalAccess.autoDiscovery.image.pullPolicy` | Init container auto-discovery image pull policy | `IfNotPresent` | +| `externalAccess.autoDiscovery.image.pullSecrets` | Init container auto-discovery image pull secrets | `[]` | +| `externalAccess.autoDiscovery.resources.limits` | The resources limits for the auto-discovery init container | `{}` | +| `externalAccess.autoDiscovery.resources.requests` | The requested resources for the auto-discovery init container | `{}` | +| `externalAccess.service.type` | Kubernetes Service type for external access. It can be NodePort, LoadBalancer or ClusterIP | `LoadBalancer` | +| `externalAccess.service.ports.external` | Kafka port used for external access when service type is LoadBalancer | `9094` | +| `externalAccess.service.loadBalancerIPs` | Array of load balancer IPs for each Kafka broker. Length must be the same as replicaCount | `[]` | +| `externalAccess.service.loadBalancerNames` | Array of load balancer Names for each Kafka broker. Length must be the same as replicaCount | `[]` | +| `externalAccess.service.loadBalancerAnnotations` | Array of load balancer annotations for each Kafka broker. Length must be the same as replicaCount | `[]` | +| `externalAccess.service.loadBalancerSourceRanges` | Address(es) that are allowed when service is LoadBalancer | `[]` | +| `externalAccess.service.nodePorts` | Array of node ports used for each Kafka broker. Length must be the same as replicaCount | `[]` | +| `externalAccess.service.externalIPs` | Use distinct service host IPs to configure Kafka external listener when service type is NodePort. Length must be the same as replicaCount | `[]` | +| `externalAccess.service.useHostIPs` | Use service host IPs to configure Kafka external listener when service type is NodePort | `false` | +| `externalAccess.service.usePodIPs` | using the MY_POD_IP address for external access. | `false` | +| `externalAccess.service.domain` | Domain or external ip used to configure Kafka external listener when service type is NodePort or ClusterIP | `""` | +| `externalAccess.service.publishNotReadyAddresses` | Indicates that any agent which deals with endpoints for this Service should disregard any indications of ready/not-ready | `false` | +| `externalAccess.service.labels` | Service labels for external access | `{}` | +| `externalAccess.service.annotations` | Service annotations for external access | `{}` | +| `externalAccess.service.extraPorts` | Extra ports to expose in the Kafka external service | `[]` | +| `networkPolicy.enabled` | Specifies whether a NetworkPolicy should be created | `false` | +| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | +| `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed | `{}` | +| `networkPolicy.externalAccess.from` | customize the from section for External Access on tcp-external port | `[]` | +| `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | ### Persistence parameters @@ -311,7 +311,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r90` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r99` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | @@ -336,7 +336,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.kafka.enabled` | Whether or not to create a standalone Kafka exporter to expose Kafka metrics | `false` | | `metrics.kafka.image.registry` | Kafka exporter image registry | `docker.io` | | `metrics.kafka.image.repository` | Kafka exporter image repository | `bitnami/kafka-exporter` | -| `metrics.kafka.image.tag` | Kafka exporter image tag (immutable tags are recommended) | `1.6.0-debian-11-r65` | +| `metrics.kafka.image.tag` | Kafka exporter image tag (immutable tags are recommended) | `1.6.0-debian-11-r70` | | `metrics.kafka.image.digest` | Kafka exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.kafka.image.pullPolicy` | Kafka exporter image pull policy | `IfNotPresent` | | `metrics.kafka.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -384,7 +384,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.jmx.enabled` | Whether or not to expose JMX metrics to Prometheus | `false` | | `metrics.jmx.image.registry` | JMX exporter image registry | `docker.io` | | `metrics.jmx.image.repository` | JMX exporter image repository | `bitnami/jmx-exporter` | -| `metrics.jmx.image.tag` | JMX exporter image tag (immutable tags are recommended) | `0.17.2-debian-11-r53` | +| `metrics.jmx.image.tag` | JMX exporter image tag (immutable tags are recommended) | `0.18.0-debian-11-r4` | | `metrics.jmx.image.digest` | JMX exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.jmx.image.pullPolicy` | JMX exporter image pull policy | `IfNotPresent` | | `metrics.jmx.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -864,6 +864,10 @@ Find more information about how to deal with common errors related to Bitnami's ## Upgrading +### To 21.0.0 + +This major updates Kafka to its newest version, 3.4.x. For more information, please refer to [kafka upgrade notes](https://kafka.apache.org/34/documentation.html#upgrade). + ### To 20.0.0 This major updates the Zookeeper subchart to it newest major, 11.0.0. For more information on this subchart's major, please refer to [zookeeper upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/zookeeper#to-1100). @@ -1060,4 +1064,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. +limitations under the License. \ No newline at end of file diff --git a/charts/bitnami/kafka/charts/common/Chart.yaml b/charts/bitnami/kafka/charts/common/Chart.yaml index 031ee0fd4..8583e628a 100644 --- a/charts/bitnami/kafka/charts/common/Chart.yaml +++ b/charts/bitnami/kafka/charts/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.2.3 +appVersion: 2.2.4 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself. home: https://github.com/bitnami/charts/tree/main/bitnami/common @@ -21,4 +21,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 2.2.3 +version: 2.2.4 diff --git a/charts/bitnami/kafka/charts/common/README.md b/charts/bitnami/kafka/charts/common/README.md index 8f3bda37d..825639f2a 100644 --- a/charts/bitnami/kafka/charts/common/README.md +++ b/charts/bitnami/kafka/charts/common/README.md @@ -12,7 +12,7 @@ dependencies: ``` ```console -$ helm dependency update +helm dependency update ``` ```yaml @@ -37,124 +37,6 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment ## Parameters -The following table lists the helpers available in the library which are scoped in different sections. - -### Affinities - -| Helper identifier | Description | Expected Input | -|-------------------------------|------------------------------------------------------|------------------------------------------------| -| `common.affinities.nodes.soft` | Return a soft nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.nodes.hard` | Return a hard nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.pods.soft` | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | -| `common.affinities.pods.hard` | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | -| `common.affinities.topologyKey` | Return a topologyKey definition | `dict "topologyKey" "FOO"` | - -### Capabilities - -| Helper identifier | Description | Expected Input | -|------------------------------------------------|------------------------------------------------------------------------------------------------|-------------------| -| `common.capabilities.kubeVersion` | Return the target Kubernetes version (using client default if .Values.kubeVersion is not set). | `.` Chart context | -| `common.capabilities.cronjob.apiVersion` | Return the appropriate apiVersion for cronjob. | `.` Chart context | -| `common.capabilities.deployment.apiVersion` | Return the appropriate apiVersion for deployment. | `.` Chart context | -| `common.capabilities.statefulset.apiVersion` | Return the appropriate apiVersion for statefulset. | `.` Chart context | -| `common.capabilities.ingress.apiVersion` | Return the appropriate apiVersion for ingress. | `.` Chart context | -| `common.capabilities.rbac.apiVersion` | Return the appropriate apiVersion for RBAC resources. | `.` Chart context | -| `common.capabilities.crd.apiVersion` | Return the appropriate apiVersion for CRDs. | `.` Chart context | -| `common.capabilities.policy.apiVersion` | Return the appropriate apiVersion for podsecuritypolicy. | `.` Chart context | -| `common.capabilities.networkPolicy.apiVersion` | Return the appropriate apiVersion for networkpolicy. | `.` Chart context | -| `common.capabilities.apiService.apiVersion` | Return the appropriate apiVersion for APIService. | `.` Chart context | -| `common.capabilities.hpa.apiVersion` | Return the appropriate apiVersion for Horizontal Pod Autoscaler | `.` Chart context | -| `common.capabilities.supportsHelmVersion` | Returns true if the used Helm version is 3.3+ | `.` Chart context | - -### Errors - -| Helper identifier | Description | Expected Input | -|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------| -| `common.errors.upgrade.passwords.empty` | It will ensure required passwords are given when we are upgrading a chart. If `validationErrors` is not empty it will throw an error and will stop the upgrade action. | `dict "validationErrors" (list $validationError00 $validationError01) "context" $` | - -### Images - -| Helper identifier | Description | Expected Input | -|-----------------------------|------------------------------------------------------|---------------------------------------------------------------------------------------------------------| -| `common.images.image` | Return the proper and full image name | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure. | -| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names (deprecated: use common.images.renderPullSecrets instead) | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global` | -| `common.images.renderPullSecrets` | Return the proper Docker Image Registry Secret Names (evaluates values as templates) | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "context" $` | - -### Ingress - -| Helper identifier | Description | Expected Input | -|-------------------------------------------|-------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.ingress.backend` | Generate a proper Ingress backend entry depending on the API version | `dict "serviceName" "foo" "servicePort" "bar"`, see the [Ingress deprecation notice](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/) for the syntax differences | -| `common.ingress.supportsPathType` | Prints "true" if the pathType field is supported | `.` Chart context | -| `common.ingress.supportsIngressClassname` | Prints "true" if the ingressClassname field is supported | `.` Chart context | -| `common.ingress.certManagerRequest` | Prints "true" if required cert-manager annotations for TLS signed certificates are set in the Ingress annotations | `dict "annotations" .Values.path.to.the.ingress.annotations` | - -### Labels - -| Helper identifier | Description | Expected Input | -|-----------------------------|-----------------------------------------------------------------------------|-------------------| -| `common.labels.standard` | Return Kubernetes standard labels | `.` Chart context | -| `common.labels.matchLabels` | Labels to use on `deploy.spec.selector.matchLabels` and `svc.spec.selector` | `.` Chart context | - -### Names - -| Helper identifier | Description | Expected Input | -|-----------------------------------|-----------------------------------------------------------------------|-------------------| -| `common.names.name` | Expand the name of the chart or use `.Values.nameOverride` | `.` Chart context | -| `common.names.fullname` | Create a default fully qualified app name. | `.` Chart context | -| `common.names.namespace` | Allow the release namespace to be overridden | `.` Chart context | -| `common.names.fullname.namespace` | Create a fully qualified app name adding the installation's namespace | `.` Chart context | -| `common.names.chart` | Chart name plus version | `.` Chart context | - -### Secrets - -| Helper identifier | Description | Expected Input | -|-----------------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.secrets.name` | Generate the name of the secret. | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure. | -| `common.secrets.key` | Generate secret key. | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure. | -| `common.secrets.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. | -| `common.secrets.exists` | Returns whether a previous generated secret already exists. | `dict "secret" "secret-name" "context" $` | - -### Storage - -| Helper identifier | Description | Expected Input | -|-------------------------------|---------------------------------------|---------------------------------------------------------------------------------------------------------------------| -| `common.storage.class` | Return the proper Storage Class | `dict "persistence" .Values.path.to.the.persistence "global" $`, see [Persistence](#persistence) for the structure. | - -### TplValues - -| Helper identifier | Description | Expected Input | -|---------------------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.tplvalues.render` | Renders a value that contains template | `dict "value" .Values.path.to.the.Value "context" $`, value is the value should rendered as template, context frequently is the chart context `$` or `.` | - -### Utils - -| Helper identifier | Description | Expected Input | -|--------------------------------|------------------------------------------------------------------------------------------|------------------------------------------------------------------------| -| `common.utils.fieldToEnvVar` | Build environment variable name given a field. | `dict "field" "my-password"` | -| `common.utils.secret.getvalue` | Print instructions to get a secret value. | `dict "secret" "secret-name" "field" "secret-value-field" "context" $` | -| `common.utils.getValueFromKey` | Gets a value from `.Values` object given its key path | `dict "key" "path.to.key" "context" $` | -| `common.utils.getKeyFromList` | Returns first `.Values` key with a defined value or first of the list if all non-defined | `dict "keys" (list "path.to.key1" "path.to.key2") "context" $` | - -### Validations - -| Helper identifier | Description | Expected Input | -|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.validations.values.single.empty` | Validate a value must not be empty. | `dict "valueKey" "path.to.value" "secret" "secret.name" "field" "my-password" "subchart" "subchart" "context" $` secret, field and subchart are optional. In case they are given, the helper will generate a how to get instruction. See [ValidateValue](#validatevalue) | -| `common.validations.values.multiple.empty` | Validate a multiple values must not be empty. It returns a shared error for all the values. | `dict "required" (list $validateValueConf00 $validateValueConf01) "context" $`. See [ValidateValue](#validatevalue) | -| `common.validations.values.mariadb.passwords` | This helper will ensure required password for MariaDB are not empty. It returns a shared error for all the values. | `dict "secret" "mariadb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mariadb chart and the helper. | -| `common.validations.values.mysql.passwords` | This helper will ensure required password for MySQL are not empty. It returns a shared error for all the values. | `dict "secret" "mysql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mysql chart and the helper. | -| `common.validations.values.postgresql.passwords` | This helper will ensure required password for PostgreSQL are not empty. It returns a shared error for all the values. | `dict "secret" "postgresql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use postgresql chart and the helper. | -| `common.validations.values.redis.passwords` | This helper will ensure required password for Redis® are not empty. It returns a shared error for all the values. | `dict "secret" "redis-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use redis chart and the helper. | -| `common.validations.values.cassandra.passwords` | This helper will ensure required password for Cassandra are not empty. It returns a shared error for all the values. | `dict "secret" "cassandra-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use cassandra chart and the helper. | -| `common.validations.values.mongodb.passwords` | This helper will ensure required password for MongoDB® are not empty. It returns a shared error for all the values. | `dict "secret" "mongodb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mongodb chart and the helper. | - -### Warnings - -| Helper identifier | Description | Expected Input | -|------------------------------|----------------------------------|------------------------------------------------------------| -| `common.warnings.rollingTag` | Warning about using rolling tag. | `ImageRoot` see [ImageRoot](#imageroot) for the structure. | - ## Special input schemas ### ImageRoot @@ -300,7 +182,7 @@ keyMapping: If we force those values to be empty we will see some alerts ```console -$ helm install test mychart --set path.to.value00="",path.to.value01="" +helm install test mychart --set path.to.value00="",path.to.value01="" 'path.to.value00' must not be empty, please add '--set path.to.value00=$PASSWORD_00' to the command. To get the current value: export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 -d) @@ -316,23 +198,23 @@ $ helm install test mychart --set path.to.value00="",path.to.value01="" [On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. -**What changes were introduced in this major version?** +#### What changes were introduced in this major version? - Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field. - Use `type: library`. [Here](https://v3.helm.sh/docs/faq/#library-chart-support) you can find more information. - The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts -**Considerations when upgrading to this version** +#### Considerations when upgrading to this version - If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues - If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore - If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3 -**Useful links** +#### Useful links -- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/ -- https://helm.sh/docs/topics/v2_v3_migration/ -- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ +- +- +- ## License @@ -342,7 +224,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/charts/bitnami/kafka/charts/common/templates/_images.tpl b/charts/bitnami/kafka/charts/common/templates/_images.tpl index b06071492..2e7b15151 100644 --- a/charts/bitnami/kafka/charts/common/templates/_images.tpl +++ b/charts/bitnami/kafka/charts/common/templates/_images.tpl @@ -17,7 +17,11 @@ Return the proper image name {{- $separator = "@" -}} {{- $termination = .imageRoot.digest | toString -}} {{- end -}} -{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} +{{- if $registryName }} + {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} +{{- else -}} + {{- printf "%s%s%s" $repositoryName $separator $termination -}} +{{- end -}} {{- end -}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/Chart.lock b/charts/bitnami/kafka/charts/zookeeper/Chart.lock index db268a715..4cd9a8ba3 100644 --- a/charts/bitnami/kafka/charts/zookeeper/Chart.lock +++ b/charts/bitnami/kafka/charts/zookeeper/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.3 -digest: sha256:2c7165542fc01b9e98b577cd8b1095d0ed8267d34b97b6e581a1176bfb8e4dcb -generated: "2023-02-17T20:26:24.808959946Z" + version: 2.2.4 +digest: sha256:634d19e9b7f6e4c07d7c04a0161ab96b3f83335ebdd70b35b952319ef0a2586b +generated: "2023-03-19T02:06:13.108650823Z" diff --git a/charts/bitnami/kafka/charts/zookeeper/Chart.yaml b/charts/bitnami/kafka/charts/zookeeper/Chart.yaml index ff0b37abe..4db28d256 100644 --- a/charts/bitnami/kafka/charts/zookeeper/Chart.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/Chart.yaml @@ -22,4 +22,4 @@ name: zookeeper sources: - https://github.com/bitnami/containers/tree/main/bitnami/zookeeper - https://zookeeper.apache.org/ -version: 11.1.3 +version: 11.1.5 diff --git a/charts/bitnami/kafka/charts/zookeeper/README.md b/charts/bitnami/kafka/charts/zookeeper/README.md index e300f71cf..eebf64f34 100644 --- a/charts/bitnami/kafka/charts/zookeeper/README.md +++ b/charts/bitnami/kafka/charts/zookeeper/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | ZooKeeper image registry | `docker.io` | | `image.repository` | ZooKeeper image repository | `bitnami/zookeeper` | -| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r6` | +| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r15` | | `image.digest` | ZooKeeper image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | ZooKeeper image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -248,7 +248,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r86` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r98` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml b/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml index 031ee0fd4..8583e628a 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.2.3 +appVersion: 2.2.4 description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself. home: https://github.com/bitnami/charts/tree/main/bitnami/common @@ -21,4 +21,4 @@ sources: - https://github.com/bitnami/charts - https://www.bitnami.com/ type: library -version: 2.2.3 +version: 2.2.4 diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md b/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md index 8f3bda37d..825639f2a 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md @@ -12,7 +12,7 @@ dependencies: ``` ```console -$ helm dependency update +helm dependency update ``` ```yaml @@ -37,124 +37,6 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment ## Parameters -The following table lists the helpers available in the library which are scoped in different sections. - -### Affinities - -| Helper identifier | Description | Expected Input | -|-------------------------------|------------------------------------------------------|------------------------------------------------| -| `common.affinities.nodes.soft` | Return a soft nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.nodes.hard` | Return a hard nodeAffinity definition | `dict "key" "FOO" "values" (list "BAR" "BAZ")` | -| `common.affinities.pods.soft` | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | -| `common.affinities.pods.hard` | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $` | -| `common.affinities.topologyKey` | Return a topologyKey definition | `dict "topologyKey" "FOO"` | - -### Capabilities - -| Helper identifier | Description | Expected Input | -|------------------------------------------------|------------------------------------------------------------------------------------------------|-------------------| -| `common.capabilities.kubeVersion` | Return the target Kubernetes version (using client default if .Values.kubeVersion is not set). | `.` Chart context | -| `common.capabilities.cronjob.apiVersion` | Return the appropriate apiVersion for cronjob. | `.` Chart context | -| `common.capabilities.deployment.apiVersion` | Return the appropriate apiVersion for deployment. | `.` Chart context | -| `common.capabilities.statefulset.apiVersion` | Return the appropriate apiVersion for statefulset. | `.` Chart context | -| `common.capabilities.ingress.apiVersion` | Return the appropriate apiVersion for ingress. | `.` Chart context | -| `common.capabilities.rbac.apiVersion` | Return the appropriate apiVersion for RBAC resources. | `.` Chart context | -| `common.capabilities.crd.apiVersion` | Return the appropriate apiVersion for CRDs. | `.` Chart context | -| `common.capabilities.policy.apiVersion` | Return the appropriate apiVersion for podsecuritypolicy. | `.` Chart context | -| `common.capabilities.networkPolicy.apiVersion` | Return the appropriate apiVersion for networkpolicy. | `.` Chart context | -| `common.capabilities.apiService.apiVersion` | Return the appropriate apiVersion for APIService. | `.` Chart context | -| `common.capabilities.hpa.apiVersion` | Return the appropriate apiVersion for Horizontal Pod Autoscaler | `.` Chart context | -| `common.capabilities.supportsHelmVersion` | Returns true if the used Helm version is 3.3+ | `.` Chart context | - -### Errors - -| Helper identifier | Description | Expected Input | -|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------| -| `common.errors.upgrade.passwords.empty` | It will ensure required passwords are given when we are upgrading a chart. If `validationErrors` is not empty it will throw an error and will stop the upgrade action. | `dict "validationErrors" (list $validationError00 $validationError01) "context" $` | - -### Images - -| Helper identifier | Description | Expected Input | -|-----------------------------|------------------------------------------------------|---------------------------------------------------------------------------------------------------------| -| `common.images.image` | Return the proper and full image name | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure. | -| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names (deprecated: use common.images.renderPullSecrets instead) | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global` | -| `common.images.renderPullSecrets` | Return the proper Docker Image Registry Secret Names (evaluates values as templates) | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "context" $` | - -### Ingress - -| Helper identifier | Description | Expected Input | -|-------------------------------------------|-------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.ingress.backend` | Generate a proper Ingress backend entry depending on the API version | `dict "serviceName" "foo" "servicePort" "bar"`, see the [Ingress deprecation notice](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/) for the syntax differences | -| `common.ingress.supportsPathType` | Prints "true" if the pathType field is supported | `.` Chart context | -| `common.ingress.supportsIngressClassname` | Prints "true" if the ingressClassname field is supported | `.` Chart context | -| `common.ingress.certManagerRequest` | Prints "true" if required cert-manager annotations for TLS signed certificates are set in the Ingress annotations | `dict "annotations" .Values.path.to.the.ingress.annotations` | - -### Labels - -| Helper identifier | Description | Expected Input | -|-----------------------------|-----------------------------------------------------------------------------|-------------------| -| `common.labels.standard` | Return Kubernetes standard labels | `.` Chart context | -| `common.labels.matchLabels` | Labels to use on `deploy.spec.selector.matchLabels` and `svc.spec.selector` | `.` Chart context | - -### Names - -| Helper identifier | Description | Expected Input | -|-----------------------------------|-----------------------------------------------------------------------|-------------------| -| `common.names.name` | Expand the name of the chart or use `.Values.nameOverride` | `.` Chart context | -| `common.names.fullname` | Create a default fully qualified app name. | `.` Chart context | -| `common.names.namespace` | Allow the release namespace to be overridden | `.` Chart context | -| `common.names.fullname.namespace` | Create a fully qualified app name adding the installation's namespace | `.` Chart context | -| `common.names.chart` | Chart name plus version | `.` Chart context | - -### Secrets - -| Helper identifier | Description | Expected Input | -|-----------------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.secrets.name` | Generate the name of the secret. | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure. | -| `common.secrets.key` | Generate secret key. | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure. | -| `common.secrets.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. | -| `common.secrets.exists` | Returns whether a previous generated secret already exists. | `dict "secret" "secret-name" "context" $` | - -### Storage - -| Helper identifier | Description | Expected Input | -|-------------------------------|---------------------------------------|---------------------------------------------------------------------------------------------------------------------| -| `common.storage.class` | Return the proper Storage Class | `dict "persistence" .Values.path.to.the.persistence "global" $`, see [Persistence](#persistence) for the structure. | - -### TplValues - -| Helper identifier | Description | Expected Input | -|---------------------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.tplvalues.render` | Renders a value that contains template | `dict "value" .Values.path.to.the.Value "context" $`, value is the value should rendered as template, context frequently is the chart context `$` or `.` | - -### Utils - -| Helper identifier | Description | Expected Input | -|--------------------------------|------------------------------------------------------------------------------------------|------------------------------------------------------------------------| -| `common.utils.fieldToEnvVar` | Build environment variable name given a field. | `dict "field" "my-password"` | -| `common.utils.secret.getvalue` | Print instructions to get a secret value. | `dict "secret" "secret-name" "field" "secret-value-field" "context" $` | -| `common.utils.getValueFromKey` | Gets a value from `.Values` object given its key path | `dict "key" "path.to.key" "context" $` | -| `common.utils.getKeyFromList` | Returns first `.Values` key with a defined value or first of the list if all non-defined | `dict "keys" (list "path.to.key1" "path.to.key2") "context" $` | - -### Validations - -| Helper identifier | Description | Expected Input | -|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `common.validations.values.single.empty` | Validate a value must not be empty. | `dict "valueKey" "path.to.value" "secret" "secret.name" "field" "my-password" "subchart" "subchart" "context" $` secret, field and subchart are optional. In case they are given, the helper will generate a how to get instruction. See [ValidateValue](#validatevalue) | -| `common.validations.values.multiple.empty` | Validate a multiple values must not be empty. It returns a shared error for all the values. | `dict "required" (list $validateValueConf00 $validateValueConf01) "context" $`. See [ValidateValue](#validatevalue) | -| `common.validations.values.mariadb.passwords` | This helper will ensure required password for MariaDB are not empty. It returns a shared error for all the values. | `dict "secret" "mariadb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mariadb chart and the helper. | -| `common.validations.values.mysql.passwords` | This helper will ensure required password for MySQL are not empty. It returns a shared error for all the values. | `dict "secret" "mysql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mysql chart and the helper. | -| `common.validations.values.postgresql.passwords` | This helper will ensure required password for PostgreSQL are not empty. It returns a shared error for all the values. | `dict "secret" "postgresql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use postgresql chart and the helper. | -| `common.validations.values.redis.passwords` | This helper will ensure required password for Redis® are not empty. It returns a shared error for all the values. | `dict "secret" "redis-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use redis chart and the helper. | -| `common.validations.values.cassandra.passwords` | This helper will ensure required password for Cassandra are not empty. It returns a shared error for all the values. | `dict "secret" "cassandra-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use cassandra chart and the helper. | -| `common.validations.values.mongodb.passwords` | This helper will ensure required password for MongoDB® are not empty. It returns a shared error for all the values. | `dict "secret" "mongodb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mongodb chart and the helper. | - -### Warnings - -| Helper identifier | Description | Expected Input | -|------------------------------|----------------------------------|------------------------------------------------------------| -| `common.warnings.rollingTag` | Warning about using rolling tag. | `ImageRoot` see [ImageRoot](#imageroot) for the structure. | - ## Special input schemas ### ImageRoot @@ -300,7 +182,7 @@ keyMapping: If we force those values to be empty we will see some alerts ```console -$ helm install test mychart --set path.to.value00="",path.to.value01="" +helm install test mychart --set path.to.value00="",path.to.value01="" 'path.to.value00' must not be empty, please add '--set path.to.value00=$PASSWORD_00' to the command. To get the current value: export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 -d) @@ -316,23 +198,23 @@ $ helm install test mychart --set path.to.value00="",path.to.value01="" [On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. -**What changes were introduced in this major version?** +#### What changes were introduced in this major version? - Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field. - Use `type: library`. [Here](https://v3.helm.sh/docs/faq/#library-chart-support) you can find more information. - The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts -**Considerations when upgrading to this version** +#### Considerations when upgrading to this version - If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues - If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore - If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3 -**Useful links** +#### Useful links -- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/ -- https://helm.sh/docs/topics/v2_v3_migration/ -- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ +- +- +- ## License @@ -342,7 +224,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl index b06071492..2e7b15151 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl @@ -17,7 +17,11 @@ Return the proper image name {{- $separator = "@" -}} {{- $termination = .imageRoot.digest | toString -}} {{- end -}} -{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} +{{- if $registryName }} + {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} +{{- else -}} + {{- printf "%s%s%s" $repositoryName $separator $termination -}} +{{- end -}} {{- end -}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/values.yaml b/charts/bitnami/kafka/charts/zookeeper/values.yaml index 7a48f6c5d..617febf4a 100644 --- a/charts/bitnami/kafka/charts/zookeeper/values.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/values.yaml @@ -76,7 +76,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/zookeeper - tag: 3.8.1-debian-11-r6 + tag: 3.8.1-debian-11-r15 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -660,7 +660,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r86 + tag: 11-debian-11-r98 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/kafka/values.yaml b/charts/bitnami/kafka/values.yaml index ef9d10ab4..3dd3bf5b1 100644 --- a/charts/bitnami/kafka/values.yaml +++ b/charts/bitnami/kafka/values.yaml @@ -77,7 +77,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/kafka - tag: 3.4.0-debian-11-r6 + tag: 3.4.0-debian-11-r12 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -779,7 +779,7 @@ externalAccess: image: registry: docker.io repository: bitnami/kubectl - tag: 1.25.6-debian-11-r14 + tag: 1.25.7-debian-11-r4 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1028,7 +1028,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r90 + tag: 11-debian-11-r99 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1110,7 +1110,7 @@ metrics: image: registry: docker.io repository: bitnami/kafka-exporter - tag: 1.6.0-debian-11-r65 + tag: 1.6.0-debian-11-r70 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1346,7 +1346,7 @@ metrics: image: registry: docker.io repository: bitnami/jmx-exporter - tag: 0.17.2-debian-11-r53 + tag: 0.18.0-debian-11-r4 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/charts/bitnami/mariadb/Chart.yaml b/charts/bitnami/mariadb/Chart.yaml index f9a428c23..97428b711 100644 --- a/charts/bitnami/mariadb/Chart.yaml +++ b/charts/bitnami/mariadb/Chart.yaml @@ -32,4 +32,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/mariadb - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 11.5.4 +version: 11.5.5 diff --git a/charts/bitnami/mariadb/README.md b/charts/bitnami/mariadb/README.md index 48e1a78d6..5bf9f6fcb 100644 --- a/charts/bitnami/mariadb/README.md +++ b/charts/bitnami/mariadb/README.md @@ -372,13 +372,13 @@ The command removes all the Kubernetes components associated with the chart and | `networkPolicy.ingressRules.primaryAccessOnlyFrom.enabled` | Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. | `false` | | `networkPolicy.ingressRules.primaryAccessOnlyFrom.namespaceSelector` | Namespace selector label that is allowed to access the primary node. This label will be used to identified the allowed namespace(s). | `{}` | | `networkPolicy.ingressRules.primaryAccessOnlyFrom.podSelector` | Pods selector label that is allowed to access the primary node. This label will be used to identified the allowed pod(s). | `{}` | -| `networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules` | Custom network policy for the primary node. | `{}` | +| `networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules` | Custom network policy for the primary node. | `[]` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.enabled` | Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. | `false` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.namespaceSelector` | Namespace selector label that is allowed to acces the secondary nodes. This label will be used to identified the allowed namespace(s). | `{}` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.podSelector` | Pods selector label that is allowed to access the secondary nodes. This label will be used to identified the allowed pod(s). | `{}` | -| `networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules` | Custom network policy for the secondary nodes. | `{}` | +| `networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules` | Custom network policy for the secondary nodes. | `[]` | | `networkPolicy.egressRules.denyConnectionsToExternal` | Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). | `false` | -| `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | +| `networkPolicy.egressRules.customRules` | Custom network policy rule | `[]` | The above parameters map to the env variables defined in [bitnami/mariadb](https://github.com/bitnami/containers/tree/main/bitnami/mariadb). For more information please refer to the [bitnami/mariadb](https://github.com/bitnami/containers/tree/main/bitnami/mariadb) image documentation. diff --git a/charts/bitnami/mariadb/values.yaml b/charts/bitnami/mariadb/values.yaml index e0b774aeb..6c2e4b032 100644 --- a/charts/bitnami/mariadb/values.yaml +++ b/charts/bitnami/mariadb/values.yaml @@ -1263,11 +1263,11 @@ networkPolicy: ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.enabled Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.namespaceSelector [object] Namespace selector label that is allowed to access the primary node. This label will be used to identified the allowed namespace(s). ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.podSelector [object] Pods selector label that is allowed to access the primary node. This label will be used to identified the allowed pod(s). - ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules [object] Custom network policy for the primary node. + ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules Custom network policy for the primary node. ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.enabled Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.namespaceSelector [object] Namespace selector label that is allowed to acces the secondary nodes. This label will be used to identified the allowed namespace(s). ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.podSelector [object] Pods selector label that is allowed to access the secondary nodes. This label will be used to identified the allowed pod(s). - ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules [object] Custom network policy for the secondary nodes. + ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules Custom network policy for the secondary nodes. ## ingressRules: ## Allow access to the primary node only from the indicated: @@ -1292,7 +1292,7 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] ## Allow access to the secondary node only from the indicated: ## @@ -1316,10 +1316,10 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] ## @param networkPolicy.egressRules.denyConnectionsToExternal Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). - ## @param networkPolicy.egressRules.customRules [object] Custom network policy rule + ## @param networkPolicy.egressRules.customRules Custom network policy rule ## egressRules: # Deny connections to external. This is not compatible with an external database. @@ -1332,4 +1332,4 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] diff --git a/charts/bitnami/mysql/Chart.yaml b/charts/bitnami/mysql/Chart.yaml index 26845b44e..a3e5c58e1 100644 --- a/charts/bitnami/mysql/Chart.yaml +++ b/charts/bitnami/mysql/Chart.yaml @@ -30,4 +30,4 @@ name: mysql sources: - https://github.com/bitnami/containers/tree/main/bitnami/mysql - https://mysql.com -version: 9.6.0 +version: 9.7.0 diff --git a/charts/bitnami/mysql/README.md b/charts/bitnami/mysql/README.md index 1a3cdd800..f952ab65f 100644 --- a/charts/bitnami/mysql/README.md +++ b/charts/bitnami/mysql/README.md @@ -315,49 +315,52 @@ The command removes all the Kubernetes components associated with the chart and ### Metrics parameters -| Name | Description | Value | -| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------- | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Exporter image registry | `docker.io` | -| `metrics.image.repository` | Exporter image repository | `bitnami/mysqld-exporter` | -| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r96` | -| `metrics.image.digest` | Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | -| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `metrics.service.type` | Kubernetes service type for MySQL Prometheus Exporter | `ClusterIP` | -| `metrics.service.port` | MySQL Prometheus Exporter service port | `9104` | -| `metrics.service.annotations` | Prometheus exporter service annotations | `{}` | -| `metrics.extraArgs.primary` | Extra args to be passed to mysqld_exporter on Primary pods | `[]` | -| `metrics.extraArgs.secondary` | Extra args to be passed to mysqld_exporter on Secondary pods | `[]` | -| `metrics.resources.limits` | The resources limits for MySQL prometheus exporter containers | `{}` | -| `metrics.resources.requests` | The requested resources for MySQL prometheus exporter containers | `{}` | -| `metrics.livenessProbe.enabled` | Enable livenessProbe | `true` | -| `metrics.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `120` | -| `metrics.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | -| `metrics.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `1` | -| `metrics.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` | -| `metrics.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | -| `metrics.readinessProbe.enabled` | Enable readinessProbe | `true` | -| `metrics.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | -| `metrics.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | -| `metrics.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | -| `metrics.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | -| `metrics.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | -| `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `false` | -| `metrics.serviceMonitor.namespace` | Specify the namespace in which the serviceMonitor resource will be created | `""` | -| `metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` | -| `metrics.serviceMonitor.interval` | Specify the interval at which metrics should be scraped | `30s` | -| `metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` | -| `metrics.serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping | `[]` | -| `metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion | `[]` | -| `metrics.serviceMonitor.selector` | ServiceMonitor selector labels | `{}` | -| `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | -| `metrics.serviceMonitor.labels` | Used to pass Labels that are used by the Prometheus installed in your cluster to select Service Monitors to work with | `{}` | -| `metrics.serviceMonitor.annotations` | ServiceMonitor annotations | `{}` | -| `metrics.prometheusRule.enabled` | Creates a Prometheus Operator prometheusRule (also requires `metrics.enabled` to be `true` and `metrics.prometheusRule.rules`) | `false` | -| `metrics.prometheusRule.namespace` | Namespace for the prometheusRule Resource (defaults to the Release Namespace) | `""` | -| `metrics.prometheusRule.additionalLabels` | Additional labels that can be used so prometheusRule will be discovered by Prometheus | `{}` | -| `metrics.prometheusRule.rules` | Prometheus Rule definitions | `[]` | +| Name | Description | Value | +| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------- | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Exporter image registry | `docker.io` | +| `metrics.image.repository` | Exporter image repository | `bitnami/mysqld-exporter` | +| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r96` | +| `metrics.image.digest` | Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | +| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `metrics.containerSecurityContext.enabled` | MySQL metrics container securityContext | `true` | +| `metrics.containerSecurityContext.runAsUser` | User ID for the MySQL metrics container | `1001` | +| `metrics.containerSecurityContext.runAsNonRoot` | Set MySQL metrics container's Security Context runAsNonRoot | `true` | +| `metrics.service.type` | Kubernetes service type for MySQL Prometheus Exporter | `ClusterIP` | +| `metrics.service.port` | MySQL Prometheus Exporter service port | `9104` | +| `metrics.service.annotations` | Prometheus exporter service annotations | `{}` | +| `metrics.extraArgs.primary` | Extra args to be passed to mysqld_exporter on Primary pods | `[]` | +| `metrics.extraArgs.secondary` | Extra args to be passed to mysqld_exporter on Secondary pods | `[]` | +| `metrics.resources.limits` | The resources limits for MySQL prometheus exporter containers | `{}` | +| `metrics.resources.requests` | The requested resources for MySQL prometheus exporter containers | `{}` | +| `metrics.livenessProbe.enabled` | Enable livenessProbe | `true` | +| `metrics.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `120` | +| `metrics.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `metrics.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `1` | +| `metrics.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` | +| `metrics.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `metrics.readinessProbe.enabled` | Enable readinessProbe | `true` | +| `metrics.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | +| `metrics.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | +| `metrics.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `metrics.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | +| `metrics.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `false` | +| `metrics.serviceMonitor.namespace` | Specify the namespace in which the serviceMonitor resource will be created | `""` | +| `metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` | +| `metrics.serviceMonitor.interval` | Specify the interval at which metrics should be scraped | `30s` | +| `metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` | +| `metrics.serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping | `[]` | +| `metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion | `[]` | +| `metrics.serviceMonitor.selector` | ServiceMonitor selector labels | `{}` | +| `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | +| `metrics.serviceMonitor.labels` | Used to pass Labels that are used by the Prometheus installed in your cluster to select Service Monitors to work with | `{}` | +| `metrics.serviceMonitor.annotations` | ServiceMonitor annotations | `{}` | +| `metrics.prometheusRule.enabled` | Creates a Prometheus Operator prometheusRule (also requires `metrics.enabled` to be `true` and `metrics.prometheusRule.rules`) | `false` | +| `metrics.prometheusRule.namespace` | Namespace for the prometheusRule Resource (defaults to the Release Namespace) | `""` | +| `metrics.prometheusRule.additionalLabels` | Additional labels that can be used so prometheusRule will be discovered by Prometheus | `{}` | +| `metrics.prometheusRule.rules` | Prometheus Rule definitions | `[]` | The above parameters map to the env variables defined in [bitnami/mysql](https://github.com/bitnami/containers/tree/main/bitnami/mysql). For more information please refer to the [bitnami/mysql](https://github.com/bitnami/containers/tree/main/bitnami/mysql) image documentation. diff --git a/charts/bitnami/mysql/templates/primary/statefulset.yaml b/charts/bitnami/mysql/templates/primary/statefulset.yaml index 6004105dd..ac20482b1 100644 --- a/charts/bitnami/mysql/templates/primary/statefulset.yaml +++ b/charts/bitnami/mysql/templates/primary/statefulset.yaml @@ -265,6 +265,9 @@ spec: - name: metrics image: {{ include "mysql.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} env: {{- if .Values.auth.usePasswordFiles }} - name: MYSQL_ROOT_PASSWORD_FILE diff --git a/charts/bitnami/mysql/templates/secondary/statefulset.yaml b/charts/bitnami/mysql/templates/secondary/statefulset.yaml index 5000e8163..237786def 100644 --- a/charts/bitnami/mysql/templates/secondary/statefulset.yaml +++ b/charts/bitnami/mysql/templates/secondary/statefulset.yaml @@ -249,6 +249,9 @@ spec: - name: metrics image: {{ include "mysql.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} env: {{- if .Values.auth.usePasswordFiles }} - name: MYSQL_ROOT_PASSWORD_FILE diff --git a/charts/bitnami/mysql/values.yaml b/charts/bitnami/mysql/values.yaml index 051ebd117..6a3744b80 100644 --- a/charts/bitnami/mysql/values.yaml +++ b/charts/bitnami/mysql/values.yaml @@ -1053,6 +1053,16 @@ metrics: ## - myRegistryKeySecretName ## pullSecrets: [] + ## MySQL metrics container security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## @param metrics.containerSecurityContext.enabled MySQL metrics container securityContext + ## @param metrics.containerSecurityContext.runAsUser User ID for the MySQL metrics container + ## @param metrics.containerSecurityContext.runAsNonRoot Set MySQL metrics container's Security Context runAsNonRoot + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + runAsNonRoot: true ## MySQL Prometheus exporter service parameters ## Mysqld Prometheus exporter liveness and readiness probes ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes diff --git a/charts/bitnami/postgresql/Chart.yaml b/charts/bitnami/postgresql/Chart.yaml index add6ad589..5dc95412f 100644 --- a/charts/bitnami/postgresql/Chart.yaml +++ b/charts/bitnami/postgresql/Chart.yaml @@ -32,4 +32,4 @@ name: postgresql sources: - https://github.com/bitnami/containers/tree/main/bitnami/postgresql - https://www.postgresql.org/ -version: 12.2.5 +version: 12.2.6 diff --git a/charts/bitnami/postgresql/README.md b/charts/bitnami/postgresql/README.md index 343875879..28f4daf1f 100644 --- a/charts/bitnami/postgresql/README.md +++ b/charts/bitnami/postgresql/README.md @@ -100,7 +100,7 @@ kubectl delete pvc -l release=my-release | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------- | | `image.registry` | PostgreSQL image registry | `docker.io` | | `image.repository` | PostgreSQL image repository | `bitnami/postgresql` | -| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.2.0-debian-11-r13` | +| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.2.0-debian-11-r14` | | `image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | PostgreSQL image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `[]` | @@ -377,7 +377,7 @@ kubectl delete pvc -l release=my-release | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r98` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r99` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | @@ -405,7 +405,7 @@ kubectl delete pvc -l release=my-release | `metrics.enabled` | Start a prometheus exporter | `false` | | `metrics.image.registry` | PostgreSQL Prometheus Exporter image registry | `docker.io` | | `metrics.image.repository` | PostgreSQL Prometheus Exporter image repository | `bitnami/postgres-exporter` | -| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.11.1-debian-11-r69` | +| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.12.0-debian-11-r71` | | `metrics.image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | PostgreSQL Prometheus Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify image pull secrets | `[]` | diff --git a/charts/bitnami/postgresql/values.yaml b/charts/bitnami/postgresql/values.yaml index 19765b1c7..2503a49b6 100644 --- a/charts/bitnami/postgresql/values.yaml +++ b/charts/bitnami/postgresql/values.yaml @@ -95,7 +95,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/postgresql - tag: 15.2.0-debian-11-r13 + tag: 15.2.0-debian-11-r14 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1136,7 +1136,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r98 + tag: 11-debian-11-r99 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1231,7 +1231,7 @@ metrics: image: registry: docker.io repository: bitnami/postgres-exporter - tag: 0.11.1-debian-11-r69 + tag: 0.12.0-debian-11-r71 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/redis/Chart.yaml b/charts/bitnami/redis/Chart.yaml index 2b2857f6b..fbfa4f26c 100644 --- a/charts/bitnami/redis/Chart.yaml +++ b/charts/bitnami/redis/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/containers/tree/main/bitnami/redis -version: 17.8.7 +version: 17.9.0 diff --git a/charts/bitnami/redis/README.md b/charts/bitnami/redis/README.md index 4b1d4f591..11a170b87 100644 --- a/charts/bitnami/redis/README.md +++ b/charts/bitnami/redis/README.md @@ -408,6 +408,7 @@ The command removes all the Kubernetes components associated with the chart and | `sentinel.service.annotations` | Additional custom annotations for Redis® Sentinel service | `{}` | | `sentinel.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | | `sentinel.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `sentinel.service.headless.annotations` | Annotations for the headless service. | `{}` | | `sentinel.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-node pods | `30` | ### Other Parameters diff --git a/charts/bitnami/redis/templates/headless-svc.yaml b/charts/bitnami/redis/templates/headless-svc.yaml index d798a0b5a..17629929a 100644 --- a/charts/bitnami/redis/templates/headless-svc.yaml +++ b/charts/bitnami/redis/templates/headless-svc.yaml @@ -8,9 +8,12 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} annotations: - {{- if .Values.commonAnnotations }} - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} + {{- if .Values.sentinel.service.headless.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.service.headless.annotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- include "redis.externalDNS.annotations" . | nindent 4 }} spec: type: ClusterIP diff --git a/charts/bitnami/redis/values.yaml b/charts/bitnami/redis/values.yaml index 879b02b6f..b99102c9e 100644 --- a/charts/bitnami/redis/values.yaml +++ b/charts/bitnami/redis/values.yaml @@ -1255,6 +1255,12 @@ sentinel: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} + ## Headless service properties + ## + headless: + ## @param sentinel.service.headless.annotations Annotations for the headless service. + ## + annotations: {} ## @param sentinel.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-node pods ## terminationGracePeriodSeconds: 30 diff --git a/charts/bitnami/tomcat/Chart.yaml b/charts/bitnami/tomcat/Chart.yaml index 35721d1ec..592b4c295 100644 --- a/charts/bitnami/tomcat/Chart.yaml +++ b/charts/bitnami/tomcat/Chart.yaml @@ -32,4 +32,4 @@ name: tomcat sources: - https://github.com/bitnami/containers/tree/main/bitnami/tomcat - http://tomcat.apache.org -version: 10.5.20 +version: 10.6.0 diff --git a/charts/bitnami/tomcat/README.md b/charts/bitnami/tomcat/README.md index d8a6b99b5..a3d2343d5 100644 --- a/charts/bitnami/tomcat/README.md +++ b/charts/bitnami/tomcat/README.md @@ -180,6 +180,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.annotations` | Annotations for Tomcat service | `{}` | | `service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | | `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `service.headless.annotations` | Annotations for the headless service. | `{}` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.hostname` | Default host for the ingress resource | `tomcat.local` | | `ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | diff --git a/charts/bitnami/tomcat/templates/svc-headless.yaml b/charts/bitnami/tomcat/templates/svc-headless.yaml index dd5a21a09..53d0a2e23 100644 --- a/charts/bitnami/tomcat/templates/svc-headless.yaml +++ b/charts/bitnami/tomcat/templates/svc-headless.yaml @@ -8,10 +8,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} - {{- if or .Values.service.annotations .Values.commonAnnotations }} + {{- if or .Values.service.headless.annotations .Values.commonAnnotations }} annotations: - {{- if .Values.service.annotations }} - {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }} + {{- if .Values.service.headless.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.headless.annotations "context" $) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} diff --git a/charts/bitnami/tomcat/values.yaml b/charts/bitnami/tomcat/values.yaml index 9c4715fde..6949cf4db 100644 --- a/charts/bitnami/tomcat/values.yaml +++ b/charts/bitnami/tomcat/values.yaml @@ -451,6 +451,12 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} + ## Headless service properties + ## + headless: + ## @param service.headless.annotations Annotations for the headless service. + ## + annotations: {} ## Ingress configuratiom ## ingress: diff --git a/charts/bitnami/wordpress/Chart.lock b/charts/bitnami/wordpress/Chart.lock index 2fea55f08..a41163880 100644 --- a/charts/bitnami/wordpress/Chart.lock +++ b/charts/bitnami/wordpress/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 6.3.13 - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 11.5.4 + version: 11.5.5 - name: common repository: https://charts.bitnami.com/bitnami version: 2.2.4 -digest: sha256:6cdf6880c17e68dc3717a6b1d6bc0b4150f2de2eadf7a2d3fe71386eff623658 -generated: "2023-03-19T02:05:20.005606461Z" +digest: sha256:b6bf1e36cf75cf20888726a965b30006de0048818437da05e4ec9bc6da926791 +generated: "2023-03-22T23:18:11.010220619Z" diff --git a/charts/bitnami/wordpress/Chart.yaml b/charts/bitnami/wordpress/Chart.yaml index eceb3243e..487173bb9 100644 --- a/charts/bitnami/wordpress/Chart.yaml +++ b/charts/bitnami/wordpress/Chart.yaml @@ -41,4 +41,4 @@ name: wordpress sources: - https://github.com/bitnami/containers/tree/main/bitnami/wordpress - https://wordpress.org/ -version: 15.2.56 +version: 15.2.57 diff --git a/charts/bitnami/wordpress/README.md b/charts/bitnami/wordpress/README.md index 6413a9dc6..30f6e9090 100644 --- a/charts/bitnami/wordpress/README.md +++ b/charts/bitnami/wordpress/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------- | --------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | WordPress image registry | `docker.io` | | `image.repository` | WordPress image repository | `bitnami/wordpress` | -| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.1.1-debian-11-r67` | +| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.1.1-debian-11-r69` | | `image.digest` | WordPress image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | WordPress image pull policy | `IfNotPresent` | | `image.pullSecrets` | WordPress image pull secrets | `[]` | @@ -247,7 +247,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | | `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | | `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r98` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r99` | | `volumePermissions.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | @@ -279,7 +279,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a sidecar prometheus exporter to expose metrics | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | | `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.13.0-debian-11-r8` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.13.0-debian-11-r9` | | `metrics.image.digest` | Apache exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | Apache exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Apache exporter image pull secrets | `[]` | diff --git a/charts/bitnami/wordpress/charts/mariadb/Chart.yaml b/charts/bitnami/wordpress/charts/mariadb/Chart.yaml index 30e79743d..d2878dc2a 100644 --- a/charts/bitnami/wordpress/charts/mariadb/Chart.yaml +++ b/charts/bitnami/wordpress/charts/mariadb/Chart.yaml @@ -28,4 +28,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/mariadb - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 11.5.4 +version: 11.5.5 diff --git a/charts/bitnami/wordpress/charts/mariadb/README.md b/charts/bitnami/wordpress/charts/mariadb/README.md index 48e1a78d6..5bf9f6fcb 100644 --- a/charts/bitnami/wordpress/charts/mariadb/README.md +++ b/charts/bitnami/wordpress/charts/mariadb/README.md @@ -372,13 +372,13 @@ The command removes all the Kubernetes components associated with the chart and | `networkPolicy.ingressRules.primaryAccessOnlyFrom.enabled` | Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. | `false` | | `networkPolicy.ingressRules.primaryAccessOnlyFrom.namespaceSelector` | Namespace selector label that is allowed to access the primary node. This label will be used to identified the allowed namespace(s). | `{}` | | `networkPolicy.ingressRules.primaryAccessOnlyFrom.podSelector` | Pods selector label that is allowed to access the primary node. This label will be used to identified the allowed pod(s). | `{}` | -| `networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules` | Custom network policy for the primary node. | `{}` | +| `networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules` | Custom network policy for the primary node. | `[]` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.enabled` | Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. | `false` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.namespaceSelector` | Namespace selector label that is allowed to acces the secondary nodes. This label will be used to identified the allowed namespace(s). | `{}` | | `networkPolicy.ingressRules.secondaryAccessOnlyFrom.podSelector` | Pods selector label that is allowed to access the secondary nodes. This label will be used to identified the allowed pod(s). | `{}` | -| `networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules` | Custom network policy for the secondary nodes. | `{}` | +| `networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules` | Custom network policy for the secondary nodes. | `[]` | | `networkPolicy.egressRules.denyConnectionsToExternal` | Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). | `false` | -| `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | +| `networkPolicy.egressRules.customRules` | Custom network policy rule | `[]` | The above parameters map to the env variables defined in [bitnami/mariadb](https://github.com/bitnami/containers/tree/main/bitnami/mariadb). For more information please refer to the [bitnami/mariadb](https://github.com/bitnami/containers/tree/main/bitnami/mariadb) image documentation. diff --git a/charts/bitnami/wordpress/charts/mariadb/values.yaml b/charts/bitnami/wordpress/charts/mariadb/values.yaml index e0b774aeb..6c2e4b032 100644 --- a/charts/bitnami/wordpress/charts/mariadb/values.yaml +++ b/charts/bitnami/wordpress/charts/mariadb/values.yaml @@ -1263,11 +1263,11 @@ networkPolicy: ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.enabled Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.namespaceSelector [object] Namespace selector label that is allowed to access the primary node. This label will be used to identified the allowed namespace(s). ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.podSelector [object] Pods selector label that is allowed to access the primary node. This label will be used to identified the allowed pod(s). - ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules [object] Custom network policy for the primary node. + ## @param networkPolicy.ingressRules.primaryAccessOnlyFrom.customRules Custom network policy for the primary node. ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.enabled Enable ingress rule that makes primary mariadb nodes only accessible from a particular origin. ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.namespaceSelector [object] Namespace selector label that is allowed to acces the secondary nodes. This label will be used to identified the allowed namespace(s). ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.podSelector [object] Pods selector label that is allowed to access the secondary nodes. This label will be used to identified the allowed pod(s). - ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules [object] Custom network policy for the secondary nodes. + ## @param networkPolicy.ingressRules.secondaryAccessOnlyFrom.customRules Custom network policy for the secondary nodes. ## ingressRules: ## Allow access to the primary node only from the indicated: @@ -1292,7 +1292,7 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] ## Allow access to the secondary node only from the indicated: ## @@ -1316,10 +1316,10 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] ## @param networkPolicy.egressRules.denyConnectionsToExternal Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). - ## @param networkPolicy.egressRules.customRules [object] Custom network policy rule + ## @param networkPolicy.egressRules.customRules Custom network policy rule ## egressRules: # Deny connections to external. This is not compatible with an external database. @@ -1332,4 +1332,4 @@ networkPolicy: ## matchLabels: ## label: example ## - customRules: {} + customRules: [] diff --git a/charts/bitnami/wordpress/values.yaml b/charts/bitnami/wordpress/values.yaml index 82b91092d..fe9ff9a89 100644 --- a/charts/bitnami/wordpress/values.yaml +++ b/charts/bitnami/wordpress/values.yaml @@ -73,7 +73,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/wordpress - tag: 6.1.1-debian-11-r67 + tag: 6.1.1-debian-11-r69 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -757,7 +757,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r98 + tag: 11-debian-11-r99 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -851,7 +851,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.13.0-debian-11-r8 + tag: 0.13.0-debian-11-r9 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/crate/crate-operator/Chart.lock b/charts/crate/crate-operator/Chart.lock index be2c48830..b273b4fc3 100644 --- a/charts/crate/crate-operator/Chart.lock +++ b/charts/crate/crate-operator/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: crate-operator-crds repository: file://../crate-operator-crds - version: 2.24.0 -digest: sha256:c49ffbfea5a0a2668a0bf2c1f87add413268b36b82fee73c642411176c45a6c5 -generated: "2023-03-21T14:36:08.260603114Z" + version: 2.25.0 +digest: sha256:f5b63acbc58495c53c6d92aef4182b983b4e790142657f77c4efa4b172bcd78c +generated: "2023-03-23T11:44:20.81618663Z" diff --git a/charts/crate/crate-operator/Chart.yaml b/charts/crate/crate-operator/Chart.yaml index e0e68dcf4..4a94ce642 100644 --- a/charts/crate/crate-operator/Chart.yaml +++ b/charts/crate/crate-operator/Chart.yaml @@ -3,16 +3,16 @@ annotations: catalog.cattle.io/display-name: CrateDB Operator catalog.cattle.io/release-name: crate-operator apiVersion: v2 -appVersion: 2.24.0 +appVersion: 2.25.0 dependencies: - condition: crate-operator-crds.enabled name: crate-operator-crds repository: file://./charts/crate-operator-crds - version: 2.24.0 + version: 2.25.0 description: Crate Operator - Helm chart for installing and upgrading Crate Operator. icon: https://raw.githubusercontent.com/crate/crate/master/docs/_static/crate-logo.svg maintainers: - name: Crate.io name: crate-operator type: application -version: 2.24.0 +version: 2.25.0 diff --git a/charts/crate/crate-operator/charts/crate-operator-crds/Chart.yaml b/charts/crate/crate-operator/charts/crate-operator-crds/Chart.yaml index d7ae325bf..c84e46aac 100644 --- a/charts/crate/crate-operator/charts/crate-operator-crds/Chart.yaml +++ b/charts/crate/crate-operator/charts/crate-operator-crds/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 2.24.0 +appVersion: 2.25.0 description: Crate Operator CRDs - Helm chart for installing and upgrading Custom Resource Definitions (CRDs) for the Crate Operator. maintainers: - name: Crate.io name: crate-operator-crds type: application -version: 2.24.0 +version: 2.25.0 diff --git a/charts/crate/crate-operator/charts/crate-operator-crds/templates/cratedbs-cloud-crate-io.yaml b/charts/crate/crate-operator/charts/crate-operator-crds/templates/cratedbs-cloud-crate-io.yaml index 7a2bdae72..76eb376de 100644 --- a/charts/crate/crate-operator/charts/crate-operator-crds/templates/cratedbs-cloud-crate-io.yaml +++ b/charts/crate/crate-operator/charts/crate-operator-crds/templates/cratedbs-cloud-crate-io.yaml @@ -307,6 +307,14 @@ spec: cluster. type: object x-kubernetes-preserve-unknown-fields: true + service: + description: Additional configuration for k8s services. + properties: + annotations: + description: Additional annotations to add to the k8s load balancer service. + type: object + x-kubernetes-preserve-unknown-fields: true + type: object ssl: properties: keystore: diff --git a/charts/datadog/datadog/CHANGELOG.md b/charts/datadog/datadog/CHANGELOG.md index 151a7fd57..4e7cd6372 100644 --- a/charts/datadog/datadog/CHANGELOG.md +++ b/charts/datadog/datadog/CHANGELOG.md @@ -1,19 +1,23 @@ # Datadog changelog -# 3.20.3 +## 3.21.0 + +* Add `datadog.remoteConfiguration.enabled` parameter to enable remote configuration. + +## 3.20.3 * Fix command script in linux init container to prevent blocking deployment in GKE Autopilot on Rapid release channel. * Only mount DogStatsD socket in non-Autopilot environments. -# 3.20.2 +## 3.20.2 * Fix R/W volume mounts for CRI on Windows -# 3.20.1 +## 3.20.1 * Fix command args in linux init container to prevent blocking deployment in GKE Autopilot. -# 3.20.0 +## 3.20.0 * Enable CWS network detections by default. @@ -21,12 +25,12 @@ * Fix R/W volume mounts in init containers on Windows -# 3.19.1 +## 3.19.1 * Mount emptyDir volumes in `/etc/datadog-agent` and `/tmp` to allow the cluster-agent to write files in those locations with read-only root filesystem. -# 3.19.0 +## 3.19.0 * Declare `readOnly` in volumeMounts. diff --git a/charts/datadog/datadog/Chart.yaml b/charts/datadog/datadog/Chart.yaml index ffa5b81da..d29f376e8 100644 --- a/charts/datadog/datadog/Chart.yaml +++ b/charts/datadog/datadog/Chart.yaml @@ -19,4 +19,4 @@ name: datadog sources: - https://app.datadoghq.com/account/settings#agent/kubernetes - https://github.com/DataDog/datadog-agent -version: 3.20.3 +version: 3.21.0 diff --git a/charts/datadog/datadog/README.md b/charts/datadog/datadog/README.md index ec2f991fe..48c94ddac 100644 --- a/charts/datadog/datadog/README.md +++ b/charts/datadog/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.20.3](https://img.shields.io/badge/Version-3.20.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.21.0](https://img.shields.io/badge/Version-3.21.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/). @@ -679,6 +679,7 @@ helm install \ | datadog.prometheusScrape.enabled | bool | `false` | Enable autodiscovering pods and services exposing prometheus metrics. | | datadog.prometheusScrape.serviceEndpoints | bool | `false` | Enable generating dedicated checks for service endpoints. | | datadog.prometheusScrape.version | int | `2` | Version of the openmetrics check to schedule by default. | +| datadog.remoteConfiguration.enabled | bool | `false` | Set to true to enable remote configuration. | | datadog.secretAnnotations | object | `{}` | | | datadog.secretBackend.arguments | string | `nil` | Configure the secret backend command arguments (space-separated strings). | | datadog.secretBackend.command | string | `nil` | Configure the secret backend command, path to the secret backend binary. | diff --git a/charts/datadog/datadog/templates/_container-agent.yaml b/charts/datadog/datadog/templates/_container-agent.yaml index a42bf3220..be441458f 100644 --- a/charts/datadog/datadog/templates/_container-agent.yaml +++ b/charts/datadog/datadog/templates/_container-agent.yaml @@ -149,6 +149,10 @@ value: {{ .Values.datadog.expvarPort | quote }} {{- include "additional-env-entries" .Values.agents.containers.agent.env | indent 4 }} {{- include "additional-env-dict-entries" .Values.agents.containers.agent.envDict | indent 4 }} + {{- if .Values.datadog.remoteConfiguration.enabled }} + - name: DD_REMOTE_CONFIGURATION_ENABLED + value: "true" + {{- end }} volumeMounts: {{- if eq .Values.targetSystem "linux" }} - name: installinfo diff --git a/charts/datadog/datadog/templates/system-probe-configmap.yaml b/charts/datadog/datadog/templates/system-probe-configmap.yaml index 5813b5fef..b23506b2a 100644 --- a/charts/datadog/datadog/templates/system-probe-configmap.yaml +++ b/charts/datadog/datadog/templates/system-probe-configmap.yaml @@ -53,6 +53,8 @@ data: enabled: {{ $.Values.datadog.securityAgent.runtime.syscallMonitor.enabled }} network: enabled: {{ $.Values.datadog.securityAgent.runtime.network.enabled }} + remote_configuration: + enabled: {{ if and .Values.datadog.securityAgent.runtime.enabled .Values.datadog.remoteConfiguration.enabled -}} true {{else -}} false {{end}} {{- if .Values.datadog.securityAgent.runtime.activityDump.enabled }} activity_dump: enabled: true diff --git a/charts/datadog/datadog/values.yaml b/charts/datadog/datadog/values.yaml index 874ce3bae..1b62b198b 100644 --- a/charts/datadog/datadog/values.yaml +++ b/charts/datadog/datadog/values.yaml @@ -378,6 +378,10 @@ datadog: # datadog.leaderLeaseDuration -- Set the lease time for leader election in second leaderLeaseDuration: # 60 + remoteConfiguration: + # datadog.remoteConfiguration.enabled -- Set to true to enable remote configuration. + enabled: false + ## Enable logs agent and provide custom configs logs: # datadog.logs.enabled -- Enables this to activate Datadog Agent log collection diff --git a/charts/digitalis/vals-operator/Chart.yaml b/charts/digitalis/vals-operator/Chart.yaml index 56b84f306..6d27101a3 100644 --- a/charts/digitalis/vals-operator/Chart.yaml +++ b/charts/digitalis/vals-operator/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.19.0-0' catalog.cattle.io/release-name: vals-operator apiVersion: v2 -appVersion: 0.7.0 +appVersion: 0.7.2 description: This helm chart installs the Digitalis Vals Operator to manage sync secrets from supported backends into Kubernetes icon: https://digitalis.io/wp-content/uploads/2020/06/cropped-Digitalis-512x512-Blue_Digitalis-512x512-Blue-32x32.png @@ -14,4 +14,4 @@ maintainers: name: Digitalis.IO name: vals-operator type: application -version: 0.7.1 +version: 0.7.2 diff --git a/charts/digitalis/vals-operator/crds/valssecrets.yaml b/charts/digitalis/vals-operator/crds/valssecrets.yaml index 9037dadd3..28b224994 100644 --- a/charts/digitalis/vals-operator/crds/valssecrets.yaml +++ b/charts/digitalis/vals-operator/crds/valssecrets.yaml @@ -47,7 +47,7 @@ spec: type: string ref: description: Ref value to the secret in the format ref+backend://path - https://github.com/variantdev/vals + https://github.com/helmfile/vals type: string required: - ref diff --git a/charts/digitalis/vals-operator/templates/serviceaccount.yaml b/charts/digitalis/vals-operator/templates/serviceaccount.yaml index 28eef8d4b..6d225fcf6 100644 --- a/charts/digitalis/vals-operator/templates/serviceaccount.yaml +++ b/charts/digitalis/vals-operator/templates/serviceaccount.yaml @@ -11,6 +11,7 @@ rules: - "apps" resources: - "statefulsets" + - "deployments" verbs: - "get" - "list" @@ -23,9 +24,6 @@ rules: - "" resources: - "secrets" - {{- if .Values.enableDbSecrets }} - - "deployments" - {{- end }} verbs: - "get" - "list" diff --git a/charts/digitalis/vals-operator/values.yaml b/charts/digitalis/vals-operator/values.yaml index 96454b16f..24d7cc6bf 100644 --- a/charts/digitalis/vals-operator/values.yaml +++ b/charts/digitalis/vals-operator/values.yaml @@ -57,7 +57,7 @@ args: [] environmentSecret: "" -# See https://github.com/variantdev/vals +# See https://github.com/helmfile/vals # for information on setting up your backend environment. env: [] # - name: VAULT_SKIP_VERIFY diff --git a/charts/dynatrace/dynatrace-operator/Chart.yaml b/charts/dynatrace/dynatrace-operator/Chart.yaml index 1742a8025..232bb20b1 100644 --- a/charts/dynatrace/dynatrace-operator/Chart.yaml +++ b/charts/dynatrace/dynatrace-operator/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.21.0-0' catalog.cattle.io/release-name: dynatrace-operator apiVersion: v2 -appVersion: 0.10.3 +appVersion: 0.10.4 description: The Dynatrace Operator Helm chart for Kubernetes and OpenShift home: https://www.dynatrace.com/ icon: https://assets.dynatrace.com/global/resources/Signet_Logo_RGB_CP_512x512px.png @@ -20,4 +20,4 @@ name: dynatrace-operator sources: - https://github.com/Dynatrace/dynatrace-operator type: application -version: 0.10.3 +version: 0.10.4 diff --git a/charts/gitlab/gitlab/CHANGELOG.md b/charts/gitlab/gitlab/CHANGELOG.md index cfb2f6eb0..a1f08ae2f 100644 --- a/charts/gitlab/gitlab/CHANGELOG.md +++ b/charts/gitlab/gitlab/CHANGELOG.md @@ -2,6 +2,39 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 6.10.0 (2023-03-21) + +### Added (6 changes) + +- [Support setting extra env vars for kas](gitlab-org/charts/gitlab@f8c5589fc5c82ea20b3798838da007b066ec67e4) ([merge request](gitlab-org/charts/gitlab!3023)) +- [Add containerSecurityContext helper templates and values to Gitaly chart ](gitlab-org/charts/gitlab@a7cd11bbc886271d4212ad368fd41885a674a647) by @BrettSeedling ([merge request](gitlab-org/charts/gitlab!2793)) +- [Add new cron backup parameter Ref #3076](gitlab-org/charts/gitlab@42b7f8dab938d0d748318d736a42e0070472ccea) by @Vedrillan ([merge request](gitlab-org/charts/gitlab!2984)) +- [Add support for Gitaly GPG signing](gitlab-org/charts/gitlab@d65fa4b7880f2b006cb1f0b54c704d47febee136) ([merge request](gitlab-org/charts/gitlab!2754)) +- [Add support for fsGroupChangePolicy to all subcharts](gitlab-org/charts/gitlab@20283351cbe24015d25b7823746534c9b65a139a) ([merge request](gitlab-org/charts/gitlab!3000)) +- [Added `useGenericEphemeralVolume` for backup-job](gitlab-org/charts/gitlab@ae5f493574d647b050f3a5c50f35f364dec69abe) by @daniel.marks ([merge request](gitlab-org/charts/gitlab!2937)) + +### Fixed (1 change) + +- [Fix config for Registry Deployment TLS SecretName](gitlab-org/charts/gitlab@3be948165d0f20c9fdc9eadaafaaaf80d4e50b09) ([merge request](gitlab-org/charts/gitlab!3017)) + +### Changed (8 changes) + +- [Update gitlab-org/charts/gitlab-runner from 0.50.1 to 0.51.0](gitlab-org/charts/gitlab@2b0632a49d5e3d58d4bd75c08fcb2bb303af21e3) ([merge request](gitlab-org/charts/gitlab!3036)) +- [Honor gitlab.psql.ci.enabled=false when generating database.yml](gitlab-org/charts/gitlab@e65fd651417c88a3f187b5fe00f4ddca2baa2bcc) ([merge request](gitlab-org/charts/gitlab!3016)) +- [Bump Container Registry to v3.69.0-gitlab](gitlab-org/charts/gitlab@c539445598a8991fa34c1af2b15efdf34d7d1adb) ([merge request](gitlab-org/charts/gitlab!3026)) +- [Update gitlab-org/container-registry from 3.67.0-gitlab to 3.68.0-gitlab](gitlab-org/charts/gitlab@5f9964246cf95b29ecd39eb730d6947aebe81249) ([merge request](gitlab-org/charts/gitlab!3007)) +- [Bump prometheus to 2.38.0](gitlab-org/charts/gitlab@6278c7572da075d11b5e5c92089a598288162afe) ([merge request](gitlab-org/charts/gitlab!3001)) +- [Replace deprecated k8s.gcr.io entries](gitlab-org/charts/gitlab@bde4f2113c7df880e14128fff4b6cfcacae2d1a1) by @tlindsay42 ([merge request](gitlab-org/charts/gitlab!2985)) +- [Update gitlab-org/charts/gitlab-runner from 0.49.3 to 0.50.1](gitlab-org/charts/gitlab@eda6fbc036bc24e01cdd2622d0b10662df574d46) ([merge request](gitlab-org/charts/gitlab!2996)) +- [Update gitlab-org/charts/gitlab-runner from 0.49.2 to 0.49.3](gitlab-org/charts/gitlab@82e4e9145a36b1a037674ebe3187116d2adce7a6) ([merge request](gitlab-org/charts/gitlab!2987)) + +### Other (4 changes) + +- [Remove GitLab Runner UBI known limitation](gitlab-org/charts/gitlab@3444929667ec0e7c5cf26e10da984fdcb1442431) ([merge request](gitlab-org/charts/gitlab!3034)) +- [Add docs and config check for gitlab-shell metrics](gitlab-org/charts/gitlab@e46e19b84a47f45018e39af1e5e0731be6982a1f) ([merge request](gitlab-org/charts/gitlab!3006)) +- [Add more context to sidekiq pod deprecation notices](gitlab-org/charts/gitlab@fdaef9d08c68beac06b0bcff16d0ec6b1bc274aa) ([merge request](gitlab-org/charts/gitlab!2966)) +- [Add more context to sidekiq pod deprecation notices](gitlab-org/charts/gitlab@378fd9116dc5147d9d4c23d81a72e0e8089f138e) ([merge request](gitlab-org/charts/gitlab!2972)) + ## 6.9.3 (2023-03-09) No changes. @@ -54,6 +87,10 @@ No changes. - [Moved minio config to global in example config](gitlab-org/charts/gitlab@973557e4cf0c5ec1e0c399fcce557fae2a87de17) ([merge request](gitlab-org/charts/gitlab!2952)) - [Doc - configure the GitLab chart with an decomposed database](gitlab-org/charts/gitlab@af72661b6f82f8f16dab591c8af67e44baf0b998) ([merge request](gitlab-org/charts/gitlab!2890)) +## 6.8.4 (2023-03-02) + +No changes. + ## 6.8.3 (2023-02-15) No changes. @@ -88,6 +125,10 @@ No changes. - [Update gitlab-org/gitlab-exporter from 11.18.2 to 12.1.0](gitlab-org/charts/gitlab@428de3dd7c208a0469b18b927fece2bc54029b19) ([merge request](gitlab-org/charts/gitlab!2911)) - [Update gitlab-org/container-registry from 3.63.0-gitlab to 3.64.0-gitlab](gitlab-org/charts/gitlab@a1edaea5f4d9d2a6d972b7412deafe6a2b50aedb) ([merge request](gitlab-org/charts/gitlab!2904)) +## 6.7.8 (2023-03-02) + +No changes. + ## 6.7.7 (2023-02-10) No changes. diff --git a/charts/gitlab/gitlab/CONTRIBUTING.md b/charts/gitlab/gitlab/CONTRIBUTING.md index 78e35844c..e49ac154a 100644 --- a/charts/gitlab/gitlab/CONTRIBUTING.md +++ b/charts/gitlab/gitlab/CONTRIBUTING.md @@ -167,9 +167,9 @@ reported by emailing contact@gitlab.com. This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant], version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/). -[accepting-mrs]: https://gitlab.com/gitlab-org/charts/gitlab/issues?label_name=Accepting+Merge+Requests -[gitlab-mr-tracker]: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests -[closed-merge-requests]: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed +[accepting-mrs]: https://gitlab.com/gitlab-org/charts/gitlab/-/issues?label_name=Accepting+Merge+Requests +[gitlab-mr-tracker]: https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests +[closed-merge-requests]: https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed [contributor-covenant]: http://contributor-covenant.org [changelog]: doc/development/changelog.md "Generate a changelog entry" [git-squash]: https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits diff --git a/charts/gitlab/gitlab/Chart.yaml b/charts/gitlab/gitlab/Chart.yaml index a1e5631ae..a19981047 100644 --- a/charts/gitlab/gitlab/Chart.yaml +++ b/charts/gitlab/gitlab/Chart.yaml @@ -3,7 +3,7 @@ annotations: catalog.cattle.io/display-name: GitLab catalog.cattle.io/release-name: gitlab apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: The One DevOps Platform home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png @@ -15,4 +15,4 @@ maintainers: name: gitlab sources: - https://gitlab.com/gitlab-org/charts/gitlab -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab-runner/CHANGELOG.md b/charts/gitlab/gitlab/charts/gitlab-runner/CHANGELOG.md index f2609c357..3033ff19c 100644 --- a/charts/gitlab/gitlab/charts/gitlab-runner/CHANGELOG.md +++ b/charts/gitlab/gitlab/charts/gitlab-runner/CHANGELOG.md @@ -1,21 +1,14 @@ -## v0.50.1 (2023-02-21) +## v0.51.0 (2023-03-20) ### New features -- Update GitLab Runner version to v15.9.1 - -## v0.50.0 (2023-02-21) - -### New features - -- Update GitLab Runner version to v15.9.0 -- Add namespace to service account manifest !375 (Daniel Schömer @quatauta) +- Update GitLab Runner version to v15.10.0 +- Removing replicaCount from deployment when HPA is configured !368 (Gustavo Oliveira @gustoliv) ### Maintenance -- Add Chart repository as source !379 (Geoffrey McQuat @gmcquat) -- Fix grammatical error in instructional comment !376 (Shafiullah Khan @gitshafi) -- Add reference to actual documentation method of obtaining runnerRegistrationToken !361 (SveLem @SveLem) +- Fix integration test scripting !383 +- Update the example reference to the helper image !382 ## v0.48.0 (2022-12-17) diff --git a/charts/gitlab/gitlab/charts/gitlab-runner/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab-runner/Chart.yaml index 1b0c1027b..44a7ee488 100644 --- a/charts/gitlab/gitlab/charts/gitlab-runner/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab-runner/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.1 +appVersion: 15.10.0 description: GitLab Runner icon: https://gitlab.com/uploads/-/system/project/avatar/250833/runner_logo.png keywords: @@ -14,4 +14,4 @@ sources: - https://gitlab.com/gitlab-org/charts/gitlab-runner - https://gitlab.com/gitlab-org/gitlab-runner - https://docs.gitlab.com/runner/ -version: 0.50.1 +version: 0.51.0 diff --git a/charts/gitlab/gitlab/charts/gitlab-runner/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab-runner/templates/deployment.yaml index 340504a5d..83f4f75ce 100644 --- a/charts/gitlab/gitlab/charts/gitlab-runner/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab-runner/templates/deployment.yaml @@ -9,7 +9,9 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: + {{- if not .Values.hpa}} replicas: {{ default 1 .Values.replicas }} + {{- end}} revisionHistoryLimit: {{ default 10 .Values.revisionHistoryLimit }} selector: matchLabels: diff --git a/charts/gitlab/gitlab/charts/gitlab-runner/values.yaml b/charts/gitlab/gitlab/charts/gitlab-runner/values.yaml index d0467e557..6aebed0a2 100644 --- a/charts/gitlab/gitlab/charts/gitlab-runner/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab-runner/values.yaml @@ -511,7 +511,7 @@ runners: # memoryLimit: 256Mi # cpuRequests: 100m # memoryRequests: 128Mi - # image: "registry.gitlab.com/gitlab-org/gitlab-runner-helper:x86_64-${CI_RUNNER_REVISION}" + # image: "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:x86_64-${CI_RUNNER_REVISION}" ## Helper container security context configuration ## Refer to https://docs.gitlab.com/runner/executors/kubernetes.html#using-security-context diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/Chart.yaml index dad13bd6b..b23871e1b 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: GitLab Geo logcursor home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -12,4 +12,4 @@ name: geo-logcursor sources: - https://gitlab.com/charts/gitlab/tree/master/charts/gitlab/charts/geo-logcursor - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-rails -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml index 58c45960a..3494031e4 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml @@ -37,9 +37,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/values.yaml index 0a84adcd7..86d003069 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/geo-logcursor/values.yaml @@ -101,6 +101,7 @@ priorityClassName: "" securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml index d78857872..deaae8f26 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Git RPC service for handling all the git calls made by GitLab home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -13,4 +13,4 @@ name: gitaly sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitaly - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitaly -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml index 0c27f23e9..0095c1c27 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml @@ -8,6 +8,9 @@ data: cp -v -L /init-config/gitaly.crt /init-secrets/gitaly/gitaly.crt cp -v -L /init-config/gitaly.key /init-secrets/gitaly/gitaly.key {{- end }} + {{- if .Values.gpgSigning.enabled }} + cp -v -L /init-config/signing_key.gpg /init-secrets/gitaly/signing_key.gpg + {{- end }} config.toml.erb: | # The directory where Gitaly's executables are stored bin_dir = "/usr/local/bin" @@ -105,6 +108,9 @@ data: [git] use_bundled_binaries = true ignore_gitconfig = true + {{- if .Values.gpgSigning.enabled }} + signing_key = '/etc/gitlab-secrets/gitaly/signing_key.gpg' + {{- end }} {{- with .Values.git }} {{- if .catFileCacheSize }} catfile_cache_size = {{ .catFileCacheSize }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml index 87ef513ae..a760cfe8d 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml @@ -61,6 +61,7 @@ spec: command: ['sh', '/config/configure'] image: {{ include "gitlab.busybox.image" (dict "local" .Values.init "global" .Values.global) | quote }} {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }} @@ -77,18 +78,7 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 12 }} - {{- if .Values.securityContext }} - securityContext: - {{- if not (empty .Values.securityContext.runAsUser) }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - {{- if not (empty .Values.securityContext.fsGroup) }} - fsGroup: {{ .Values.securityContext.fsGroup }} - {{- if not (empty .Values.securityContext.fsGroupChangePolicy) }} - fsGroupChangePolicy: {{ .Values.securityContext.fsGroupChangePolicy }} - {{- end }} - {{- end }} - {{- end }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: @@ -124,6 +114,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.containerSecurityContext" . | indent 10 }} ports: - containerPort: {{ coalesce .Values.service.internalPort .Values.global.gitaly.service.internalPort }} name: grpc-gitaly @@ -220,6 +211,13 @@ spec: items: - key: {{ template "gitlab.gitlab-shell.authToken.key" . }} path: ".gitlab_shell_secret" + {{- if .Values.gpgSigning.enabled }} + - secret: + name: {{ .Values.gpgSigning.secret }} + items: + - key: {{ .Values.gpgSigning.key }} + path: "signing_key.gpg" + {{- end }} {{- if .Values.global.gitaly.tls.enabled }} {{- $secretName := include "gitlab.gitaly.tls.secret" . -}} {{- if .storage }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/values.yaml index c60bd62ef..e6787b56e 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/values.yaml @@ -38,6 +38,7 @@ init: resources: requests: cpu: 50m + containerSecurityContext: {} ## Support for tolerations for pod scheduling tolerations: [] @@ -138,10 +139,15 @@ resources: ## For PodDisruptionBudget, how many pods can be unavailable at one time maxUnavailable: 1 -## Allow to overwrite under which User and Group we're running. +## Allow to overwrite under which User and Group Pod will be running. securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch + +## Allow to overwrite the specific security context under which the gitaly container is running. +containerSecurityContext: + runAsUser: 1000 ## Enable deployment to use a serviceAccount serviceAccount: @@ -176,3 +182,10 @@ packObjectsCache: {} # enabled: false # dir: "/home/git/repositories/+gitaly/PackObjectsCache" # max_age: 5m + +## Enable Gitaly to GPG sign all commits created by GitLab +## ref: https://docs.gitlab.com/ee/administration/gitaly/configure_gitaly.html#configure-commit-signing-for-gitlab-ui-commits +gpgSigning: {} + # enabled: false + # secret: glGPG + # key: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/Chart.yaml index aadf793e2..085f7c61a 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/Chart.yaml @@ -14,4 +14,4 @@ sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitlab-exporter - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-exporter - https://gitlab.com/gitlab-org/gitlab-exporter -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml index 144ed4c8b..1be34f099 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml @@ -45,9 +45,7 @@ spec: {{- end }} spec: - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .antiAffinity) "hard" }} affinity: podAntiAffinity: @@ -79,6 +77,7 @@ spec: command: ['sh', '/config/configure'] image: {{ include "gitlab.busybox.image" (dict "local" .Values.init "global" $.Values.global) | quote }} {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }} @@ -102,6 +101,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag .Chart.AppVersion }}{{ include "gitlab.image.tagSuffix" . }}" {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.containerSecurityContext" . | indent 10 }} env: - name: CONFIG_TEMPLATE_DIRECTORY value: '/var/opt/gitlab-exporter/templates' diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/values.yaml index d81e44d84..f9a411b30 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-exporter/values.yaml @@ -50,6 +50,7 @@ init: resources: requests: cpu: 50m + containerSecurityContext: {} global: redis: @@ -69,10 +70,15 @@ resources: cpu: 75m memory: 100M -## Allow to overwrite under which User and Group we're running. +## Allow to overwrite under which User and Group the Pod will be running. securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch + +## Allow to overwrite the specific security context under which the container is running. +containerSecurityContext: + runAsUser: 1000 ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-grafana/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-grafana/Chart.yaml index a7a59bae9..86b280c96 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-grafana/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-grafana/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Adapt the Grafana chart to interface to the GitLab App home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -13,4 +13,4 @@ name: gitlab-grafana sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitlab-grafana - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-grafana -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/Chart.yaml index c8302356a..37d96ed2d 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Daemon for serving static websites from GitLab projects home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -14,4 +14,4 @@ sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitlab-pages - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-pages - https://gitlab.com/gitlab-org/gitlab-pages -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml index 600d14166..3516a540b 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml @@ -52,9 +52,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/values.yaml index 538132f8d..b35ab83f2 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-pages/values.yaml @@ -117,6 +117,7 @@ resources: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml index 82e91cd4e..062cc3d1b 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 14.17.0 +appVersion: 14.18.0 description: sshd for Gitlab home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -14,4 +14,4 @@ name: gitlab-shell sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitlab-shell - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-shell -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml index 172ebfb03..250190619 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml @@ -56,6 +56,7 @@ spec: command: ['sh', '/config/configure'] image: {{ include "gitlab.busybox.image" (dict "local" .Values.init "global" $.Values.global) | quote }} {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }} @@ -72,9 +73,7 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 12 }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: @@ -104,6 +103,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.containerSecurityContext" . | indent 10 }} ports: {{- if .Values.metrics.enabled }} - containerPort: {{ .Values.metrics.port }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/values.yaml index ee427939d..2b949e3ee 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/values.yaml @@ -26,6 +26,7 @@ init: resources: requests: cpu: 50m + containerSecurityContext: {} # Tolerations for pod scheduling tolerations: [] @@ -120,10 +121,15 @@ config: krb5Config: "" servicePrincipalName: "" -## Allow to overwrite under which User and Group we're running. +## Allow to overwrite under which User and Group the Pod will be running. securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch + +## Allow to overwrite the specific security context under which the gitaly container is running. +containerSecurityContext: + runAsUser: 1000 ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml index 76c839323..f155148ff 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v15.9.0 +appVersion: v15.10.0 description: GitLab Agent Server home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -17,4 +17,4 @@ name: kas sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitlab-kas - https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/_default-config.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/_default-config.yaml index f83e4605f..8cbb47bc8 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/_default-config.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/_default-config.yaml @@ -16,6 +16,7 @@ agent: url_path_prefix: "{{ .Values.ingress.k8sApiPath }}" gitlab: address: "{{ template "gitlab.workhorse.url" . }}" + external_url: "{{- template "gitlab.gitlab.url" . -}}" authentication_secret_file: "/etc/kas/.gitlab_kas_secret" observability: listen: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/deployment.yaml index 4088d5e64..ca6162223 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/kas/templates/deployment.yaml @@ -69,10 +69,7 @@ spec: matchLabels: {{- include "gitlab.selectorLabels" . | nindent 18 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - runAsGroup: {{ .Values.securityContext.runAsGroup }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} {{- include "gitlab.priorityClassName" . | nindent 6 }} initContainers: @@ -93,6 +90,8 @@ spec: fieldPath: status.podIP - name: OWN_PRIVATE_API_URL value: "{{ include "gitlab.kas.internal.scheme" . }}://$(POD_IP):{{ .Values.service.privateApiPort }}" + {{- include "gitlab.extraEnv" . | nindent 12 }} + {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }} ports: - containerPort: {{ .Values.service.internalPort }} name: {{ template "name" . }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/kas/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/kas/values.yaml index 09d1a4415..6bee1541a 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/kas/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/kas/values.yaml @@ -57,6 +57,9 @@ podLabels: {} common: labels: {} serviceLabels: {} +## Additional environment variables to set +extraEnv: {} +extraEnvFrom: {} resources: requests: cpu: 100m @@ -115,6 +118,8 @@ securityContext: runAsUser: 65532 runAsGroup: 65532 fsGroup: 65532 + # fsGroupChangePolicy: OnRootMismatch + redis: enabled: true diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml index 4055ab797..f7fe9775c 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml @@ -13,4 +13,4 @@ name: mailroom sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/mailroom - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-mailroom -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/templates/deployment.yaml index 1e952a3c7..2e1ee280c 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/templates/deployment.yaml @@ -33,9 +33,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/values.yaml index 1799e42cc..aa6f374a6 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/values.yaml @@ -159,6 +159,7 @@ resources: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml index 43c1b0024..df0863655 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Database migrations and other versioning tasks for upgrading Gitlab home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -12,4 +12,4 @@ name: migrations sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/migrations - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-rails -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/templates/_jobspec.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/templates/_jobspec.yaml index bfff9759f..581e01e1e 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/templates/_jobspec.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/templates/_jobspec.yaml @@ -36,9 +36,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }} serviceAccountName: {{ include "gitlab.serviceAccount.name" . }} {{- end }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/values.yaml index f6d941033..766faf68f 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/values.yaml @@ -81,6 +81,7 @@ backoffLimit: 6 securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml index 9131b07c4..a45270842 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Praefect is a router and transaction manager for Gitaly, and a required component for running a Gitaly Cluster. home: https://about.gitlab.com/ @@ -16,4 +16,4 @@ sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/praefect - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitaly - https://gitlab.com/gitlab-org/gitaly/-/tree/master/cmd/praefect -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/templates/statefulset.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/templates/statefulset.yaml index f9f87ac42..6273df4ae 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/templates/statefulset.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/templates/statefulset.yaml @@ -86,9 +86,7 @@ spec: readOnly: false resources: {{- toYaml $.Values.init.resources | nindent 12 }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }} serviceAccountName: {{ include "gitlab.serviceAccount.name" . }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/values.yaml index bf981ef06..51709376b 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/values.yaml @@ -33,6 +33,7 @@ metrics: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch replicas: 2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml index 749402ed5..c75cf5cd2 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: Gitlab Sidekiq for asynchronous task processing in rails home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -13,4 +13,4 @@ name: sidekiq sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/sidekiq - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-sidekiq -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/templates/deployment.yaml index fa185d379..7e02be4aa 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/templates/deployment.yaml @@ -82,9 +82,7 @@ spec: {{- end }} {{- $priorityClassName := dict "Values" (dict "global" (dict "priorityClassName" $.Values.global.priorityClassName) "priorityClassName" $.Values.priorityClassName) -}} {{- include "gitlab.priorityClassName" $priorityClassName | nindent 6 }} - securityContext: - runAsUser: {{ $.Values.securityContext.runAsUser }} - fsGroup: {{ $.Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" $.Values.securityContext | nindent 6 }} {{- if eq (default $.Values.global.antiAffinity .antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/values.yaml index 76e6060a3..620f4ddd8 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/values.yaml @@ -325,6 +325,7 @@ pods: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml index 958a5f67b..8e1d846ff 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml @@ -14,4 +14,4 @@ name: spamcheck sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/spamcheck - https://gitlab.com/gitlab-org/spamcheck -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/templates/deployment.yaml index bc6217cc3..a4c388627 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/templates/deployment.yaml @@ -39,9 +39,7 @@ spec: serviceAccountName: {{ include "gitlab.serviceAccount.name" . }} {{- end }} automountServiceAccountToken: false - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/values.yaml index a25d60a6e..84eaffb6a 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/values.yaml @@ -83,6 +83,7 @@ tolerations: [] securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml index 60799bd68..9e087cc15 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: For manually running rake tasks through kubectl home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -13,4 +13,4 @@ name: toolbox sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/toolbox - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-toolbox -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/_helpers.tpl b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/_helpers.tpl new file mode 100644 index 000000000..62a85a4cd --- /dev/null +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/_helpers.tpl @@ -0,0 +1,67 @@ +{{/* vim: set filetype=mustache: */}} + +{{- define "toolbox.backups.cron.persistence.persistentVolumeClaim" -}} +metadata: +{{- if not .Values.backups.cron.persistence.useGenericEphemeralVolume }} + name: {{ template "fullname" . }}-backup-tmp + namespace: {{ $.Release.Namespace }} +{{- end }} + labels: + {{- include "gitlab.standardLabels" . | nindent 4 }} + {{- include "gitlab.commonLabels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.backups.cron.persistence.accessMode | quote }} + resources: + requests: + storage: {{ .Values.backups.cron.persistence.size | quote }} +{{- if .Values.backups.cron.persistence.volumeName }} + volumeName: {{ .Values.backups.cron.persistence.volumeName }} +{{- end }} +{{- if .Values.backups.cron.persistence.storageClass }} +{{- if (eq "-" .Values.backups.cron.persistence.storageClass) }} + storageClassName: "" +{{- else }} + storageClassName: "{{ .Values.backups.cron.persistence.storageClass }}" +{{- end -}} +{{- end }} + selector: +{{- if .Values.backups.cron.persistence.matchLabels }} + matchLabels: + {{- toYaml .Values.backups.cron.persistence.matchLabels | nindent 6 }} +{{- end -}} +{{- if .Values.backups.cron.persistence.matchExpressions }} + matchExpressions: + {{- toYaml .Values.backups.cron.persistence.matchExpressions | nindent 6 }} +{{- end -}} +{{- end -}} + +{{/* +Returns the secret configuring access to the object storage for backups. + +Usage: + {{ include "toolbox.backups.objectStorage.config.secret" .Values.backups.objectStorage }} + +*/}} +{{- define "toolbox.backups.objectStorage.config.secret" -}} +{{- if eq .backend "gcs" -}} +- secret: + name: {{ .config.secret }} + items: + - key: {{ default "config" .config.key }} + path: objectstorage/{{ default "config" .config.key }} +{{- else if eq .backend "azure" -}} +- secret: + name: {{ .config.secret }} + items: + - key: {{ default "config" .config.key }} + path: objectstorage/azure_config +{{- else -}} +- secret: + name: {{ .config.secret }} + items: + - key: {{ default "config" .config.key }} + path: objectstorage/.s3cfg +{{- end -}} +{{- end -}} + diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/backup-job.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/backup-job.yaml index f0c7994c7..6c2236200 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/backup-job.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/backup-job.yaml @@ -34,7 +34,7 @@ spec: {{- include "gitlab.commonLabels" . | nindent 12 }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} - cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + cluster-autoscaler.kubernetes.io/safe-to-evict: {{ .Values.backups.cron.safeToEvict | quote }} {{- range $key, $value := .Values.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} @@ -89,7 +89,9 @@ spec: - cp /etc/gitlab/.s3cfg $HOME/.s3cfg && backup-utility {{ .Values.backups.cron.extraArgs }} # alpine sleep has no infinity {{- else if eq .Values.backups.objectStorage.backend "gcs" }} - sh /var/opt/gitlab/templates/configure-gsutil && backup-utility {{ .Values.backups.cron.extraArgs }} - {{- end }} + {{- else if eq .Values.backups.objectStorage.backend "azure" }} + - backup-utility {{ .Values.backups.cron.extraArgs }} + {{- end }} image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" {{- include "gitlab.image.pullPolicy" $imageCfg | indent 14 }} env: @@ -129,6 +131,10 @@ spec: - name: GOOGLE_APPLICATION_CREDENTIALS value: '/etc/gitlab/objectstorage/{{ default "config" .Values.backups.objectStorage.config.key }}' {{- end }} + {{- if eq .Values.backups.objectStorage.backend "azure" }} + - name: AZURE_CONFIG_FILE + value: '/etc/gitlab/objectstorage/azure_config' + {{- end }} volumeMounts: {{- include "gitlab.extraVolumeMounts" . | nindent 16 }} - name: toolbox-config @@ -158,8 +164,14 @@ spec: name: {{ template "fullname" . }} - name: toolbox-tmp {{- if .Values.backups.cron.persistence.enabled }} + {{- if .Values.backups.cron.persistence.useGenericEphemeralVolume }} + ephemeral: + volumeClaimTemplate: + {{- include "toolbox.backups.cron.persistence.persistentVolumeClaim" . | nindent 18 }} + {{- else }} persistentVolumeClaim: claimName: {{ template "fullname" . }}-backup-tmp + {{- end }} {{- else }} emptyDir: {} {{- end }} @@ -189,18 +201,7 @@ spec: path: registry/gitlab-registry.key {{- include "gitlab.registry.notificationSecret.mount" $ | nindent 16 -}} {{- if or .Values.backups.objectStorage.config (not .Values.global.minio.enabled) }} - - secret: - name: {{ required "A valid backups.objectStorage.config.secret is needed!" .Values.backups.objectStorage.config.secret }} - items: - - key: {{ default "config" .Values.backups.objectStorage.config.key }} - path: objectstorage/.s3cfg - {{- end }} - {{- if eq .Values.backups.objectStorage.backend "gcs" }} - - secret: - name: {{ required "A valid backups.objectStorage.config.secret is needed!" .Values.backups.objectStorage.config.secret }} - items: - - key: {{ default "config" .Values.backups.objectStorage.config.key }} - path: objectstorage/{{ default "config" .Values.backups.objectStorage.config.key }} + {{- include "toolbox.backups.objectStorage.config.secret" .Values.backups.objectStorage | nindent 16 }} {{- end }} {{- include "gitlab.kas.mountSecrets" $ | nindent 16 }} {{- include "gitlab.pages.mountSecrets" $ | nindent 16 }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/deployment.yaml index cdc9fd868..b692cf237 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/deployment.yaml @@ -37,12 +37,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} - {{- if not (empty .Values.securityContext.fsGroupChangePolicy) }} - fsGroupChangePolicy: {{ .Values.securityContext.fsGroupChangePolicy }} - {{- end }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }} serviceAccountName: {{ include "gitlab.serviceAccount.name" . }} {{- end }} @@ -107,6 +102,8 @@ spec: - cp -v -r -L /etc/gitlab/.s3cfg $HOME/.s3cfg && while sleep 3600; do :; done # alpine sleep has no infinity {{- else if eq .Values.backups.objectStorage.backend "gcs" }} - sh /var/opt/gitlab/templates/configure-gsutil && while sleep 3600; do :; done + {{- else if eq .Values.backups.objectStorage.backend "azure" }} + - while sleep 3600; do :; done {{- end }} image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} @@ -149,6 +146,10 @@ spec: - name: GOOGLE_APPLICATION_CREDENTIALS value: '/etc/gitlab/objectstorage/{{ default "config" .Values.backups.objectStorage.config.key }}' {{- end }} + {{- if eq .Values.backups.objectStorage.backend "azure" }} + - name: AZURE_CONFIG_FILE + value: '/etc/gitlab/objectstorage/azure_config' + {{- end }} {{- include "gitlab.extraEnv" . | nindent 12 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }} volumeMounts: @@ -232,18 +233,7 @@ spec: path: registry/gitlab-registry.key {{- include "gitlab.registry.notificationSecret.mount" $ | nindent 10 -}} {{- if or .Values.backups.objectStorage.config (not (or .Values.global.minio.enabled .Values.global.appConfig.object_store.enabled)) }} - - secret: - name: {{ .Values.backups.objectStorage.config.secret }} - items: - - key: {{ default "config" .Values.backups.objectStorage.config.key }} - path: objectstorage/.s3cfg - {{- end }} - {{- if eq .Values.backups.objectStorage.backend "gcs" }} - - secret: - name: {{ .Values.backups.objectStorage.config.secret }} - items: - - key: {{ default "config" .Values.backups.objectStorage.config.key }} - path: objectstorage/{{ default "config" .Values.backups.objectStorage.config.key }} + {{- include "toolbox.backups.objectStorage.config.secret" .Values.backups.objectStorage | nindent 10 }} {{- end }} {{- include "gitlab.pages.mountSecrets" $ | nindent 10 }} {{- include "gitlab.kas.mountSecrets" $ | nindent 10 }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/pvc.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/pvc.yaml index 632f191c3..cc74867fa 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/pvc.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/templates/pvc.yaml @@ -35,38 +35,10 @@ spec: {{- end -}} {{- end }} {{- if and .Values.enabled .Values.backups.cron.enabled .Values.backups.cron.persistence.enabled }} +{{- if not .Values.backups.cron.persistence.useGenericEphemeralVolume }} --- kind: PersistentVolumeClaim apiVersion: v1 -metadata: - name: {{ template "fullname" . }}-backup-tmp - namespace: {{ $.Release.Namespace }} - labels: - {{- include "gitlab.standardLabels" . | nindent 4 }} - {{- include "gitlab.commonLabels" . | nindent 4 }} -spec: - accessModes: - - {{ .Values.backups.cron.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.backups.cron.persistence.size | quote }} -{{- if .Values.backups.cron.persistence.volumeName }} - volumeName: {{ .Values.backups.cron.persistence.volumeName }} -{{- end }} -{{- if .Values.backups.cron.persistence.storageClass }} -{{- if (eq "-" .Values.backups.cron.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.backups.cron.persistence.storageClass }}" -{{- end -}} -{{- end }} - selector: -{{- if .Values.backups.cron.persistence.matchLabels }} - matchLabels: - {{- toYaml .Values.backups.cron.persistence.matchLabels | nindent 6 }} -{{- end -}} -{{- if .Values.backups.cron.persistence.matchExpressions }} - matchExpressions: - {{- toYaml .Values.backups.cron.persistence.matchExpressions | nindent 6 }} +{{ include "toolbox.backups.cron.persistence.persistentVolumeClaim" . }} {{- end -}} {{- end }} diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/values.yaml index 4b245ec4e..0212f8a34 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/values.yaml @@ -144,6 +144,7 @@ backups: suspend: false backoffLimit: 6 # activeDeadlineSeconds: + safeToEvict: false restartPolicy: "OnFailure" extraArgs: "" resources: @@ -155,6 +156,11 @@ backups: memory: 350M persistence: enabled: false + ## Use a generic ephemeral volume. + ## This kind of volume will exist only as long as the pod exists. + ## Requires at least Kubernetes version 1.23. + ## https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#generic-ephemeral-volumes + useGenericEphemeralVolume: false ## toolbox temporarily Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -255,6 +261,7 @@ persistence: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml index ef4bc931f..a975724da 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 15.9.3 +appVersion: 15.10.0 description: HTTP server for Gitlab home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg @@ -14,4 +14,4 @@ name: webservice sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/webservice - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-webservice -version: 6.9.3 +version: 6.10.0 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/templates/deployment.yaml index fea5c67b4..95111a72a 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/templates/deployment.yaml @@ -78,9 +78,7 @@ spec: {{- include "gitlab.nodeSelector" $nodeSelectors | nindent 6 }} {{- $priorityClassName := dict "Values" (dict "global" (dict "priorityClassName" $.Values.global.priorityClassName) "priorityClassName" $.Values.priorityClassName) -}} {{- include "gitlab.priorityClassName" $priorityClassName | nindent 6 }} - securityContext: - runAsUser: {{ $.Values.securityContext.runAsUser }} - fsGroup: {{ $.Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" $.Values.securityContext | nindent 6 }} {{- if eq (default $.Values.global.antiAffinity $.Values.antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/values.yaml index 084770a0c..d5761f5b5 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/values.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/values.yaml @@ -422,6 +422,7 @@ sharedUploadDir: {} securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch ## Enable deployment to use a serviceAccount serviceAccount: diff --git a/charts/gitlab/gitlab/charts/gitlab/templates/_database.yml.tpl b/charts/gitlab/gitlab/charts/gitlab/templates/_database.yml.tpl index df101b33f..ac01a1885 100644 --- a/charts/gitlab/gitlab/charts/gitlab/templates/_database.yml.tpl +++ b/charts/gitlab/gitlab/charts/gitlab/templates/_database.yml.tpl @@ -13,6 +13,7 @@ datamodel: {{ .Values.local | toYaml | nindent 4 }} production: {{- range $database := without (keys .Values.local.psql) "main" | concat (list "main") }} {{- $context := get $.Values.local.psql $database }} +{{- if eq (include "gitlab.psql.database.enabled" $context) "true" }} {{ $database }}: adapter: postgresql encoding: unicode @@ -32,12 +33,27 @@ production: database_tasks: {{ template "gitlab.psql.databaseTasks" $context }} {{- include "gitlab.database.loadBalancing" $context | nindent 4 }} {{- include "gitlab.psql.ssl.config" $context | nindent 4 }} +{{- end -}} {{- end }} {{- if include "gitlab.geo.secondary" . }} {{- include "gitlab.geo.database.yml" . | nindent 2 }} {{- end }} {{- end -}} +{{/* +Return if the database is enabled +Returns psql.enabled if it is a boolean, +otherwise it will fallback to "true" default +*/}} +{{- define "gitlab.psql.database.enabled" -}} +{{- $globalSet := and (hasKey .Values.global.psql "enabled") (kindIs "bool" .Values.global.psql.enabled) -}} +{{- if $globalSet }} +{{- .Values.global.psql.enabled }} +{{- else }} +{{- true }} +{{- end -}} +{{- end -}} + {{/* Sets 'databaseTasks: false' if the additional database points to the same database as 'main:', where the db, host and port do match. diff --git a/charts/gitlab/gitlab/charts/minio/templates/minio_deployment.yaml b/charts/gitlab/gitlab/charts/minio/templates/minio_deployment.yaml index 11e99a30d..4cba8672b 100644 --- a/charts/gitlab/gitlab/charts/minio/templates/minio_deployment.yaml +++ b/charts/gitlab/gitlab/charts/minio/templates/minio_deployment.yaml @@ -41,9 +41,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- include "gitlab.priorityClassName" . | nindent 6 }} volumes: - name: podinfo diff --git a/charts/gitlab/gitlab/charts/minio/values.yaml b/charts/gitlab/gitlab/charts/minio/values.yaml index e273cc07b..1f3a8b77b 100644 --- a/charts/gitlab/gitlab/charts/minio/values.yaml +++ b/charts/gitlab/gitlab/charts/minio/values.yaml @@ -255,6 +255,7 @@ maxUnavailable: 1 securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch deployment: strategy: diff --git a/charts/gitlab/gitlab/charts/nginx-ingress/values.yaml b/charts/gitlab/gitlab/charts/nginx-ingress/values.yaml index eec0d5e12..137a8943e 100644 --- a/charts/gitlab/gitlab/charts/nginx-ingress/values.yaml +++ b/charts/gitlab/gitlab/charts/nginx-ingress/values.yaml @@ -10,8 +10,8 @@ controller: name: controller image: - registry: k8s.gcr.io - repository: registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller + registry: registry.gitlab.com + image: gitlab-org/cloud-native/mirror/images/ingress-nginx/controller tag: "v1.2.1" digest: sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8 pullPolicy: IfNotPresent @@ -588,7 +588,7 @@ controller: patch: enabled: true image: - registry: k8s.gcr.io + registry: registry.k8s.io image: ingress-nginx/kube-webhook-certgen # for backwards compatibility consider setting the full image url via the repository value below # use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail diff --git a/charts/gitlab/gitlab/charts/prometheus/Chart.lock b/charts/gitlab/gitlab/charts/prometheus/Chart.lock index be0479781..e155027d0 100644 --- a/charts/gitlab/gitlab/charts/prometheus/Chart.lock +++ b/charts/gitlab/gitlab/charts/prometheus/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 4.0.2 -digest: sha256:1cb7faf0f663f5ce63684a8f5b32e12ade8f0d2b77957aacc9233932ab06c656 -generated: "2022-01-14T12:51:07.409657119Z" + version: 4.22.1 +digest: sha256:04f11ab7b2ecb900626848ab03c1282138bf25129ead625dfc9ee2b691c64613 +generated: "2022-11-04T08:29:08.939956248Z" diff --git a/charts/gitlab/gitlab/charts/prometheus/Chart.yaml b/charts/gitlab/gitlab/charts/prometheus/Chart.yaml index 0799ac42a..7905f2bfd 100644 --- a/charts/gitlab/gitlab/charts/prometheus/Chart.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -appVersion: 2.31.1 +appVersion: 2.39.1 dependencies: - condition: kubeStateMetrics.enabled name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 4.0.* + version: 4.22.* description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png @@ -15,8 +15,6 @@ maintainers: name: zanhsieh - email: miroslav.hadzhiev@gmail.com name: Xtigyro -- email: monotek23@gmail.com - name: monotek - email: naseem@transit.app name: naseemkullah name: prometheus @@ -27,4 +25,4 @@ sources: - https://github.com/prometheus/node_exporter - https://github.com/kubernetes/kube-state-metrics type: application -version: 15.0.4 +version: 15.18.0 diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/Chart.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/Chart.yaml index 0b8c042f1..93c119701 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/Chart.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.2.4 +appVersion: 2.6.0 description: Install kube-state-metrics to generate and expose cluster-level metrics home: https://github.com/kubernetes/kube-state-metrics/ keywords: @@ -12,8 +12,10 @@ maintainers: name: tariq1890 - email: manuel@rueg.eu name: mrueg +- email: davidcalvertfr@gmail.com + name: dotdc name: kube-state-metrics sources: - https://github.com/kubernetes/kube-state-metrics/ type: application -version: 4.0.2 +version: 4.22.1 diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/OWNERS b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/OWNERS deleted file mode 100644 index 206b4fee7..000000000 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- tariq1890 -- mrueg -reviewers: -- tariq1890 -- mrueg diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/_helpers.tpl b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/_helpers.tpl index 88f5c06af..0d193fbc0 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/_helpers.tpl +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/_helpers.tpl @@ -57,7 +57,7 @@ Create chart name and version as used by the chart label. Generate basic labels */}} {{- define "kube-state-metrics.labels" }} -helm.sh/chart: {{ include "kube-state-metrics.chart" . }} +helm.sh/chart: {{ template "kube-state-metrics.chart" . }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/component: metrics app.kubernetes.io/part-of: {{ template "kube-state-metrics.name" . }} @@ -68,6 +68,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- if .Values.customLabels }} {{ toYaml .Values.customLabels }} {{- end }} +{{- if .Values.releaseLabel }} +release: {{ .Release.Name }} +{{- end }} {{- end }} {{/* @@ -77,3 +80,22 @@ Selector labels app.kubernetes.io/name: {{ include "kube-state-metrics.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} + +{{/* Sets default scrape limits for servicemonitor */}} +{{- define "servicemonitor.scrapeLimits" -}} +{{- with .sampleLimit }} +sampleLimit: {{ . }} +{{- end }} +{{- with .targetLimit }} +targetLimit: {{ . }} +{{- end }} +{{- with .labelLimit }} +labelLimit: {{ . }} +{{- end }} +{{- with .labelNameLengthLimit }} +labelNameLengthLimit: {{ . }} +{{- end }} +{{- with .labelValueLengthLimit }} +labelValueLengthLimit: {{ . }} +{{- end }} +{{- end -}} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/deployment.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/deployment.yaml index 5e666c552..e529d3fcc 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/deployment.yaml @@ -9,6 +9,10 @@ metadata: namespace: {{ template "kube-state-metrics.namespace" . }} labels: {{- include "kube-state-metrics.labels" . | indent 4 }} + {{- if .Values.annotations }} + annotations: +{{ toYaml .Values.annotations | indent 4 }} + {{- end }} spec: selector: matchLabels: @@ -30,16 +34,13 @@ spec: hostNetwork: {{ .Values.hostNetwork }} serviceAccountName: {{ template "kube-state-metrics.serviceAccountName" . }} {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsGroup: {{ .Values.securityContext.runAsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} + securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }} {{- end }} {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: {{ template "kube-state-metrics.name" . }} {{- if .Values.autosharding.enabled }} env: - name: POD_NAME @@ -53,9 +54,7 @@ spec: {{- end }} args: {{- if .Values.extraArgs }} - {{- range .Values.extraArgs }} - - {{ . }} - {{- end }} + {{- .Values.extraArgs | toYaml | nindent 8 }} {{- end }} {{- if .Values.service.port }} - --port={{ .Values.service.port | default 8080}} @@ -75,8 +74,20 @@ spec: {{- if .Values.metricDenylist }} - --metric-denylist={{ .Values.metricDenylist | join "," }} {{- end }} + {{- $namespaces := list }} {{- if .Values.namespaces }} - - --namespaces={{ tpl (.Values.namespaces | join ",") $ }} + {{- range $ns := join "," .Values.namespaces | split "," }} + {{- $namespaces = append $namespaces (tpl $ns $) }} + {{- end }} + {{- end }} + {{- if .Values.releaseNamespace }} + {{- $namespaces = append $namespaces ( include "kube-state-metrics.namespace" . ) }} + {{- end }} + {{- if $namespaces }} + - --namespaces={{ $namespaces | mustUniq | join "," }} + {{- end }} + {{- if .Values.namespacesDenylist }} + - --namespaces-denylist={{ tpl (.Values.namespacesDenylist | join ",") $ }} {{- end }} {{- if .Values.autosharding.enabled }} - --pod=$(POD_NAME) @@ -88,15 +99,26 @@ spec: {{- if .Values.selfMonitor.telemetryHost }} - --telemetry-host={{ .Values.selfMonitor.telemetryHost }} {{- end }} + {{- if .Values.selfMonitor.telemetryPort }} - --telemetry-port={{ .Values.selfMonitor.telemetryPort | default 8081 }} - {{- if .Values.kubeconfig.enabled }} + {{- end }} + {{- if or (.Values.kubeconfig.enabled) (.Values.volumeMounts) }} volumeMounts: + {{- if .Values.kubeconfig.enabled }} - name: kubeconfig mountPath: /opt/k8s/.kube/ readOnly: true {{- end }} + {{- if .Values.volumeMounts }} +{{ toYaml .Values.volumeMounts | indent 8 }} + {{- end }} + {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.image.sha }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}@sha256:{{ .Values.image.sha }}" + {{- else }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + {{- end }} ports: - containerPort: {{ .Values.service.port | default 8080}} name: "http" @@ -140,9 +162,18 @@ spec: tolerations: {{ toYaml .Values.tolerations | indent 8 }} {{- end }} - {{- if .Values.kubeconfig.enabled}} + {{- if .Values.topologySpreadConstraints }} + topologySpreadConstraints: +{{ toYaml .Values.topologySpreadConstraints | indent 8 }} + {{- end }} + {{- if or (.Values.kubeconfig.enabled) (.Values.volumes) }} volumes: + {{- if .Values.kubeconfig.enabled}} - name: kubeconfig secret: secretName: {{ template "kube-state-metrics.fullname" . }}-kubeconfig {{- end }} + {{- if .Values.volumes }} +{{ toYaml .Values.volumes | indent 8 }} + {{- end }} + {{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/pdb.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/pdb.yaml index cbcf3a37e..3771b511d 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/pdb.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/pdb.yaml @@ -1,5 +1,9 @@ {{- if .Values.podDisruptionBudget -}} +{{ if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}} +apiVersion: policy/v1 +{{- else -}} apiVersion: policy/v1beta1 +{{- end }} kind: PodDisruptionBudget metadata: name: {{ template "kube-state-metrics.fullname" . }} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/podsecuritypolicy.yaml index 3299056ab..8905e113e 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/podsecuritypolicy.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/podsecuritypolicy.yaml @@ -1,4 +1,4 @@ -{{- if .Values.podSecurityPolicy.enabled }} +{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrole.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrole.yaml index 69047d4ff..654e4a3d5 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrole.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrole.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.podSecurityPolicy.enabled .Values.rbac.create -}} +{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml index 03c56d575..5b62a18bd 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.podSecurityPolicy.enabled .Values.rbac.create -}} +{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/role.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/role.yaml index 76a1f7069..6474914fa 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/role.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/role.yaml @@ -1,5 +1,5 @@ {{- if and (eq .Values.rbac.create true) (not .Values.rbac.useExistingRole) -}} -{{- range (split "," .Values.namespaces) }} +{{- range (ternary (join "," .Values.namespaces | split "," ) (list "") (eq $.Values.rbac.useClusterRole false)) }} --- apiVersion: rbac.authorization.k8s.io/v1 {{- if eq $.Values.rbac.useClusterRole false }} @@ -9,16 +9,7 @@ kind: ClusterRole {{- end }} metadata: labels: - app.kubernetes.io/name: {{ template "kube-state-metrics.name" $ }} - app.kubernetes.io/instance: {{ $.Release.Name }} - app.kubernetes.io/component: metrics - app.kubernetes.io/managed-by: {{ $.Release.Service }} - app.kubernetes.io/version: "{{ $.Chart.Version }}" - app.kubernetes.io/part-of: {{ template "kube-state-metrics.name" $ }} - helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version }} - {{- if $.Values.customLabels }} - {{ toYaml $.Values.customLabels }} - {{- end }} + {{- include "kube-state-metrics.labels" $ | indent 4 }} name: {{ template "kube-state-metrics.fullname" $ }} {{- if eq $.Values.rbac.useClusterRole false }} namespace: {{ . }} @@ -78,6 +69,12 @@ rules: - jobs verbs: ["list", "watch"] {{ end -}} +{{ if has "leases" $.Values.collectors }} +- apiGroups: ["coordination.k8s.io"] + resources: + - leases + verbs: ["list", "watch"] +{{ end -}} {{ if has "limitranges" $.Values.collectors }} - apiGroups: [""] resources: @@ -192,5 +189,8 @@ rules: - verticalpodautoscalers verbs: ["list", "watch"] {{ end -}} +{{ if $.Values.rbac.extraRules }} +{{ toYaml $.Values.rbac.extraRules }} +{{ end }} {{- end -}} {{- end -}} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/rolebinding.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/rolebinding.yaml index 606a79f41..330651b73 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/rolebinding.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/rolebinding.yaml @@ -1,11 +1,11 @@ {{- if and (eq .Values.rbac.create true) (eq .Values.rbac.useClusterRole false) -}} -{{- range (split "," $.Values.namespaces) }} +{{- range (join "," $.Values.namespaces) | split "," }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - {{- include "kube-state-metrics.labels" . | indent 4 }} + {{- include "kube-state-metrics.labels" $ | indent 4 }} name: {{ template "kube-state-metrics.fullname" $ }} namespace: {{ . }} roleRef: diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/service.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/service.yaml index 853cf469e..92c6d4fca 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/service.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/service.yaml @@ -27,9 +27,15 @@ spec: protocol: TCP port: {{ .Values.selfMonitor.telemetryPort | default 8081 }} targetPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }} + {{- if .Values.selfMonitor.telemetryNodePort }} + nodePort: {{ .Values.selfMonitor.telemetryNodePort }} + {{- end }} {{ end }} {{- if .Values.service.loadBalancerIP }} loadBalancerIP: "{{ .Values.service.loadBalancerIP }}" +{{- end }} +{{- if .Values.service.clusterIP }} + clusterIP: "{{ .Values.service.clusterIP }}" {{- end }} selector: {{- include "kube-state-metrics.selectorLabels" . | indent 4 }} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/servicemonitor.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/servicemonitor.yaml index 52695c366..e93df4c49 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/servicemonitor.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/servicemonitor.yaml @@ -6,38 +6,76 @@ metadata: namespace: {{ template "kube-state-metrics.namespace" . }} labels: {{- include "kube-state-metrics.labels" . | indent 4 }} - {{- if .Values.prometheus.monitor.additionalLabels }} -{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }} - {{- end }} + {{- with .Values.prometheus.monitor.additionalLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: + jobLabel: {{ default "app.kubernetes.io/name" .Values.prometheus.monitor.jobLabel }} + {{- include "servicemonitor.scrapeLimits" .Values.prometheus.monitor | indent 2 }} selector: matchLabels: + {{- with .Values.prometheus.monitor.selectorOverride }} + {{- toYaml . | nindent 6 }} + {{- else }} {{- include "kube-state-metrics.selectorLabels" . | indent 6 }} + {{- end }} endpoints: - port: http - {{- if .Values.prometheus.monitor.honorLabels }} + {{- if .Values.prometheus.monitor.interval }} + interval: {{ .Values.prometheus.monitor.interval }} + {{- end }} + {{- if .Values.prometheus.monitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }} + {{- end }} + {{- if .Values.prometheus.monitor.proxyUrl }} + proxyUrl: {{ .Values.prometheus.monitor.proxyUrl}} + {{- end }} + {{- if .Values.prometheus.monitor.honorLabels }} honorLabels: true - {{- end }} - {{- if .Values.prometheus.monitor.metricRelabelings }} + {{- end }} + {{- if .Values.prometheus.monitor.metricRelabelings }} metricRelabelings: - {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 6 }} - {{- end }} - {{- if .Values.prometheus.monitor.relabelings }} + {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 8 }} + {{- end }} + {{- if .Values.prometheus.monitor.relabelings }} relabelings: - {{- toYaml .Values.prometheus.monitor.relabelings | nindent 6 }} - {{- end }} - {{ if .Values.selfMonitor.enabled }} + {{- toYaml .Values.prometheus.monitor.relabelings | nindent 8 }} + {{- end }} + {{- if .Values.prometheus.monitor.scheme }} + scheme: {{ .Values.prometheus.monitor.scheme }} + {{- end }} + {{- if .Values.prometheus.monitor.tlsConfig }} + tlsConfig: + {{- toYaml .Values.prometheus.monitor.tlsConfig | nindent 8 }} + {{- end }} + {{- if .Values.selfMonitor.enabled }} - port: metrics - {{- if .Values.prometheus.monitor.honorLabels }} + {{- if .Values.prometheus.monitor.interval }} + interval: {{ .Values.prometheus.monitor.interval }} + {{- end }} + {{- if .Values.prometheus.monitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }} + {{- end }} + {{- if .Values.prometheus.monitor.proxyUrl }} + proxyUrl: {{ .Values.prometheus.monitor.proxyUrl}} + {{- end }} + {{- if .Values.prometheus.monitor.honorLabels }} honorLabels: true - {{- end }} - {{- if .Values.prometheus.monitor.metricRelabelings }} + {{- end }} + {{- if .Values.prometheus.monitor.metricRelabelings }} metricRelabelings: - {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 6 }} - {{- end }} - {{- if .Values.prometheus.monitor.relabelings }} + {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 8 }} + {{- end }} + {{- if .Values.prometheus.monitor.relabelings }} relabelings: - {{- toYaml .Values.prometheus.monitor.relabelings | nindent 6 }} - {{- end }} - {{ end }} + {{- toYaml .Values.prometheus.monitor.relabelings | nindent 8 }} + {{- end }} + {{- if .Values.prometheus.monitor.scheme }} + scheme: {{ .Values.prometheus.monitor.scheme }} + {{- end }} + {{- if .Values.prometheus.monitor.tlsConfig }} + tlsConfig: + {{- toYaml .Values.prometheus.monitor.tlsConfig | nindent 8 }} + {{- end }} + {{- end }} {{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml new file mode 100644 index 000000000..e825e5c86 --- /dev/null +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml @@ -0,0 +1,34 @@ +{{- if and (.Capabilities.APIVersions.Has "autoscaling.k8s.io/v1") (.Values.verticalPodAutoscaler.enabled) }} +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ template "kube-state-metrics.fullname" . }} + namespace: {{ template "kube-state-metrics.namespace" . }} + labels: + {{- include "kube-state-metrics.labels" . | indent 4 }} +spec: + resourcePolicy: + containerPolicies: + - containerName: {{ template "kube-state-metrics.name" . }} + {{- if .Values.verticalPodAutoscaler.controlledResources }} + controlledResources: {{ .Values.verticalPodAutoscaler.controlledResources }} + {{- end }} + {{- if .Values.verticalPodAutoscaler.maxAllowed }} + maxAllowed: + {{ toYaml .Values.verticalPodAutoscaler.maxAllowed | nindent 8 }} + {{- end }} + {{- if .Values.verticalPodAutoscaler.minAllowed }} + minAllowed: + {{ toYaml .Values.verticalPodAutoscaler.minAllowed | nindent 8 }} + {{- end }} + targetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ template "kube-state-metrics.fullname" . }} + {{- if .Values.verticalPodAutoscaler.updatePolicy }} + updatePolicy: + {{- if .Values.verticalPodAutoscaler.updatePolicy.updateMode }} + updateMode: {{ .Values.verticalPodAutoscaler.updatePolicy.updateMode }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/values.yaml b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/values.yaml index 70ba35682..67e8bca6b 100644 --- a/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/values.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/charts/kube-state-metrics/values.yaml @@ -1,8 +1,9 @@ # Default values for kube-state-metrics. prometheusScrape: true image: - repository: k8s.gcr.io/kube-state-metrics/kube-state-metrics - tag: v2.2.4 + repository: registry.k8s.io/kube-state-metrics/kube-state-metrics + tag: v2.6.0 + sha: "" pullPolicy: IfNotPresent imagePullSecrets: [] @@ -28,12 +29,16 @@ service: type: ClusterIP nodePort: 0 loadBalancerIP: "" + clusterIP: "" annotations: {} ## Additional labels to add to all resources customLabels: {} # app: kube-state-metrics +## set to true to add the release label so scraping of the servicemonitor with kube-prometheus-stack works out of the box +releaseLabel: false + hostNetwork: false rbac: @@ -46,6 +51,13 @@ rbac: # If set to false - Run without Cluteradmin privs needed - ONLY works if namespace is also set (if useExistingRole is set this name is used as ClusterRole or Role to bind to) useClusterRole: true + # Add permissions for CustomResources' apiGroups in Role/ClusterRole. Should be used in conjunction with Custom Resource State Metrics configuration + # Example: + # - apiGroups: ["monitoring.coreos.com"] + # resources: ["prometheuses"] + # verbs: ["list", "watch"] + extraRules: [] + serviceAccount: # Specifies whether a ServiceAccount should be created, require rbac true create: true @@ -65,9 +77,35 @@ prometheus: enabled: false additionalLabels: {} namespace: "" + jobLabel: "" + interval: "" + ## SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. + ## + sampleLimit: 0 + + ## TargetLimit defines a limit on the number of scraped targets that will be accepted. + ## + targetLimit: 0 + + ## Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelLimit: 0 + + ## Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelNameLengthLimit: 0 + + ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelValueLengthLimit: 0 + scrapeTimeout: "" + proxyUrl: "" + selectorOverride: {} honorLabels: false metricRelabelings: [] relabelings: [] + scheme: "" + tlsConfig: {} ## Specify if a Pod Security Policy for kube-state-metrics must be created ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ @@ -109,6 +147,13 @@ affinity: {} ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] +## Topology spread constraints for pod assignment +## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ +topologySpreadConstraints: [] + +# Annotations to be added to the deployment/statefulset +annotations: {} + # Annotations to be added to the pod podAnnotations: {} @@ -158,6 +203,7 @@ collectors: - horizontalpodautoscalers - ingresses - jobs + - leases - limitranges - mutatingwebhookconfigurations - namespaces @@ -184,9 +230,17 @@ kubeconfig: # base64 encoded kube-config file secret: -# Comma-separated list of namespaces to be enabled for collecting resources. By default all namespaces are collected. +# Enable only the release namespace for collecting resources. By default all namespaces are collected. +# If releaseNamespace and namespaces are both set a merged list will be collected. +releaseNamespace: false + +# Comma-separated list(string) or yaml list of namespaces to be enabled for collecting resources. By default all namespaces are collected. namespaces: "" +# Comma-separated list of namespaces not to be enabled. If namespaces and namespaces-denylist are both set, +# only namespaces that are excluded in namespaces-denylist will be used. +namespacesDenylist: "" + ## Override the deployment namespace ## namespaceOverride: "" @@ -210,7 +264,42 @@ kubeTargetVersionOverride: "" # Enable self metrics configuration for service and Service Monitor # Default values for telemetry configuration can be overridden +# If you set telemetryNodePort, you must also set service.type to NodePort selfMonitor: enabled: false # telemetryHost: 0.0.0.0 # telemetryPort: 8081 + # telemetryNodePort: 0 + +# Enable vertical pod autoscaler support for kube-state-metrics +verticalPodAutoscaler: + enabled: false + # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory + controlledResources: [] + + # Define the max allowed resources for the pod + maxAllowed: {} + # cpu: 200m + # memory: 100Mi + # Define the min allowed resources for the pod + minAllowed: {} + # cpu: 200m + # memory: 100Mi + + # updatePolicy: + # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates + # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto". + # updateMode: Auto + +# volumeMounts are used to add custom volume mounts to deployment. +# See example below +volumeMounts: [] +# - mountPath: /etc/config +# name: config-volume + +# volumes are used to add custom volumes to deployment +# See example below +volumes: [] +# - configMap: +# name: cm-for-volume +# name: config-volume diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/_helpers.tpl b/charts/gitlab/gitlab/charts/prometheus/templates/_helpers.tpl index 065065c56..00645db70 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/_helpers.tpl +++ b/charts/gitlab/gitlab/charts/prometheus/templates/_helpers.tpl @@ -177,12 +177,17 @@ Return the appropriate apiVersion for networkpolicy. {{- define "prometheus.networkPolicy.apiVersion" -}} {{- print "networking.k8s.io/v1" -}} {{- end -}} + {{/* -Return the appropriate apiVersion for podsecuritypolicy. +Return the appropriate apiVersion for poddisruptionbudget. */}} -{{- define "prometheus.podSecurityPolicy.apiVersion" -}} +{{- define "prometheus.podDisruptionBudget.apiVersion" -}} +{{- if .Capabilities.APIVersions.Has "policy/v1" }} +{{- print "policy/v1" -}} +{{- else -}} {{- print "policy/v1beta1" -}} {{- end -}} +{{- end -}} {{/* Return the appropriate apiVersion for rbac. */}} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/cm.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/cm.yaml index cb09bf067..2da8b1d01 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/cm.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/cm.yaml @@ -7,6 +7,7 @@ metadata: name: {{ template "prometheus.alertmanager.fullname" . }} {{ include "prometheus.namespace" . | indent 2 }} data: + allow-snippet-annotations: "false" {{- $root := . -}} {{- range $key, $value := .Values.alertmanagerFiles }} {{- if $key | regexMatch ".*\\.ya?ml$" }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/deploy.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/deploy.yaml index d52ca44b9..c3b6e8fd7 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/deploy.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/deploy.yaml @@ -47,6 +47,10 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }} image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}" imagePullPolicy: "{{ .Values.alertmanager.image.pullPolicy }}" + {{- with .Values.alertmanager.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} env: {{- range $key, $value := .Values.alertmanager.extraEnv }} - name: {{ $key }} @@ -82,6 +86,10 @@ spec: httpGet: path: {{ .Values.alertmanager.prefixURL }}/-/ready port: 9093 + {{- with .Values.alertmanager.probeHeaders }} + httpHeaders: +{{- toYaml . | nindent 14 }} + {{- end }} initialDelaySeconds: 30 timeoutSeconds: 30 resources: @@ -98,23 +106,46 @@ spec: subPath: {{ .subPath }} readOnly: {{ .readOnly }} {{- end }} + {{- range .Values.alertmanager.extraConfigmapMounts }} + - name: {{ .name }} + mountPath: {{ .mountPath }} + subPath: {{ .subPath }} + readOnly: {{ .readOnly }} + {{- end }} {{- if .Values.configmapReload.alertmanager.enabled }} - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.alertmanager.name }} image: "{{ .Values.configmapReload.alertmanager.image.repository }}:{{ .Values.configmapReload.alertmanager.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.alertmanager.image.pullPolicy }}" + {{- with .Values.configmapReload.alertmanager.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9093{{ .Values.alertmanager.prefixURL }}/-/reload {{- range $key, $value := .Values.configmapReload.alertmanager.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} + {{- range .Values.configmapReload.alertmanager.extraVolumeDirs }} + - --volume-dir={{ . }} + {{- end }} + {{- if .Values.configmapReload.alertmanager.containerPort }} + ports: + - containerPort: {{ .Values.configmapReload.alertmanager.containerPort }} + {{- end }} resources: {{ toYaml .Values.configmapReload.alertmanager.resources | indent 12 }} volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true + {{- range .Values.configmapReload.alertmanager.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.alertmanager.name }}-{{ .name }} + mountPath: {{ .mountPath }} + subPath: {{ .subPath }} + readOnly: {{ .readOnly }} + {{- end }} {{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: @@ -128,9 +159,9 @@ spec: dnsConfig: {{ toYaml . | indent 8 }} {{- end }} - {{- if .Values.alertmanager.securityContext }} + {{- with .Values.alertmanager.securityContext }} securityContext: -{{ toYaml .Values.alertmanager.securityContext | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.alertmanager.tolerations }} tolerations: @@ -156,6 +187,16 @@ spec: {{- with .optional }} optional: {{ . }} {{- end }} + {{- end }} + {{- range .Values.alertmanager.extraConfigmapMounts }} + - name: {{ .name }} + configMap: + name: {{ .configMap }} + {{- end }} + {{- range .Values.configmapReload.alertmanager.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.alertmanager.name }}-{{ .name }} + configMap: + name: {{ .configMap }} {{- end }} - name: storage-volume {{- if .Values.alertmanager.persistentVolume.enabled }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pdb.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pdb.yaml index 41a92f364..75031dae3 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pdb.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.alertmanager.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 +apiVersion: {{ template "prometheus.podDisruptionBudget.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ template "prometheus.alertmanager.fullname" . }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/psp.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/psp.yaml index 64fb13003..9e1995871 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/psp.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/psp.yaml @@ -1,14 +1,15 @@ {{- if and .Values.alertmanager.enabled .Values.rbac.create .Values.podSecurityPolicy.enabled }} -apiVersion: {{ template "prometheus.podSecurityPolicy.apiVersion" . }} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy" }} +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus.alertmanager.fullname" . }} labels: {{- include "prometheus.alertmanager.labels" . | nindent 4 }} + {{- with .Values.alertmanager.podSecurityPolicy.annotations }} annotations: -{{- if .Values.alertmanager.podSecurityPolicy.annotations }} -{{ toYaml .Values.alertmanager.podSecurityPolicy.annotations | indent 4 }} -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: privileged: false allowPrivilegeEscalation: false @@ -44,3 +45,4 @@ spec: max: 65535 readOnlyRootFilesystem: true {{- end }} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pvc.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pvc.yaml index 160e296a5..c2eec84eb 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pvc.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/pvc.yaml @@ -32,6 +32,9 @@ spec: selector: {{- toYaml .Values.alertmanager.persistentVolume.selector | nindent 4 }} {{- end -}} +{{- if .Values.alertmanager.persistentVolume.volumeName }} + volumeName: "{{ .Values.alertmanager.persistentVolume.volumeName }}" +{{- end }} {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/sts.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/sts.yaml index 4f247dc48..fe6bebf66 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/sts.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/alertmanager/sts.yaml @@ -47,6 +47,10 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }} image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}" imagePullPolicy: "{{ .Values.alertmanager.image.pullPolicy }}" + {{- with .Values.alertmanager.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} env: {{- range $key, $value := .Values.alertmanager.extraEnv }} - name: {{ $key }} @@ -85,6 +89,10 @@ spec: httpGet: path: {{ .Values.alertmanager.prefixURL }}/#/status port: 9093 + {{- with .Values.alertmanager.probeHeaders }} + httpHeaders: +{{- toYaml . | nindent 14 }} + {{- end }} initialDelaySeconds: 30 timeoutSeconds: 30 resources: @@ -105,9 +113,20 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.alertmanager.name }} image: "{{ .Values.configmapReload.alertmanager.image.repository }}:{{ .Values.configmapReload.alertmanager.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.alertmanager.image.pullPolicy }}" + {{- with .Values.configmapReload.alertmanager.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} args: - --volume-dir=/etc/config - --webhook-url=http://localhost:9093{{ .Values.alertmanager.prefixURL }}/-/reload + {{- range $key, $value := .Values.configmapReload.alertmanager.extraArgs }} + - --{{ $key }}={{ $value }} + {{- end }} + {{- if .Values.configmapReload.alertmanager.port }} + ports: + - containerPort: {{ .Values.configmapReload.alertmanager.port }} + {{- end }} resources: {{ toYaml .Values.configmapReload.alertmanager.resources | indent 12 }} volumeMounts: @@ -123,9 +142,9 @@ spec: nodeSelector: {{ toYaml .Values.alertmanager.nodeSelector | indent 8 }} {{- end }} - {{- if .Values.alertmanager.securityContext }} + {{- with .Values.alertmanager.securityContext }} securityContext: -{{ toYaml .Values.alertmanager.securityContext | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.alertmanager.tolerations }} tolerations: diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/extra-manifests.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/extra-manifests.yaml new file mode 100644 index 000000000..567f7bf32 --- /dev/null +++ b/charts/gitlab/gitlab/charts/prometheus/templates/extra-manifests.yaml @@ -0,0 +1,4 @@ +{{ range .Values.extraManifests }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/daemonset.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/daemonset.yaml index 667be9f49..d1d5cf064 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/daemonset.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/daemonset.yaml @@ -68,6 +68,10 @@ spec: hostPort: {{ .Values.nodeExporter.service.hostPort }} resources: {{ toYaml .Values.nodeExporter.resources | indent 12 }} + {{- if .Values.nodeExporter.container.securityContext }} + securityContext: +{{ toYaml .Values.nodeExporter.container.securityContext | indent 12 }} + {{- end }} volumeMounts: - name: proc mountPath: /host/proc diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/psp.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/psp.yaml index bd9c73bee..7759bce7e 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/psp.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/node-exporter/psp.yaml @@ -1,14 +1,15 @@ {{- if and .Values.nodeExporter.enabled .Values.rbac.create .Values.podSecurityPolicy.enabled }} -apiVersion: {{ template "prometheus.podSecurityPolicy.apiVersion" . }} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy" }} +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus.nodeExporter.fullname" . }} labels: {{- include "prometheus.nodeExporter.labels" . | nindent 4 }} + {{- with .Values.nodeExporter.podSecurityPolicy.annotations }} annotations: -{{- if .Values.nodeExporter.podSecurityPolicy.annotations }} -{{ toYaml .Values.nodeExporter.podSecurityPolicy.annotations | indent 4 }} -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: privileged: false allowPrivilegeEscalation: false @@ -53,3 +54,4 @@ spec: - min: 1 max: 65535 {{- end }} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/deploy.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/deploy.yaml index ffdbfcc42..92bed89ef 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/deploy.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/deploy.yaml @@ -47,6 +47,8 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.pushgateway.name }} image: "{{ .Values.pushgateway.image.repository }}:{{ .Values.pushgateway.image.tag }}" imagePullPolicy: "{{ .Values.pushgateway.image.pullPolicy }}" + securityContext: + {{- toYaml .Values.pushgateway.containerSecurityContext | nindent 12 }} args: {{- range $key, $value := .Values.pushgateway.extraArgs }} {{- $stringvalue := toString $value }} @@ -66,6 +68,10 @@ spec: path: /-/healthy {{- end }} port: 9091 + {{- with .Values.pushgateway.probeHeaders }} + httpHeaders: + {{- toYaml . | nindent 16 }} + {{- end }} initialDelaySeconds: 10 timeoutSeconds: 10 readinessProbe: @@ -76,6 +82,10 @@ spec: path: /-/ready {{- end }} port: 9091 + {{- with .Values.pushgateway.probeHeaders }} + httpHeaders: + {{- toYaml . | nindent 16 }} + {{- end }} initialDelaySeconds: 10 timeoutSeconds: 10 resources: diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pdb.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pdb.yaml index 50beb486d..36543ba59 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pdb.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.pushgateway.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 +apiVersion: {{ template "prometheus.podDisruptionBudget.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ template "prometheus.pushgateway.fullname" . }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/psp.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/psp.yaml index 1ca3267f8..0b5a53430 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/psp.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/psp.yaml @@ -1,14 +1,15 @@ {{- if and .Values.pushgateway.enabled .Values.rbac.create .Values.podSecurityPolicy.enabled }} -apiVersion: {{ template "prometheus.podSecurityPolicy.apiVersion" . }} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy" }} +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus.pushgateway.fullname" . }} labels: {{- include "prometheus.pushgateway.labels" . | nindent 4 }} + {{- with .Values.pushgateway.podSecurityPolicy.annotations }} annotations: -{{- if .Values.pushgateway.podSecurityPolicy.annotations }} -{{ toYaml .Values.pushgateway.podSecurityPolicy.annotations | indent 4 }} -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: privileged: false allowPrivilegeEscalation: false @@ -40,3 +41,4 @@ spec: max: 65535 readOnlyRootFilesystem: true {{- end }} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pvc.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pvc.yaml index d5d64ddcc..fcb6efb50 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pvc.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/pvc.yaml @@ -27,5 +27,8 @@ spec: resources: requests: storage: "{{ .Values.pushgateway.persistentVolume.size }}" +{{- if .Values.pushgateway.persistentVolume.volumeName }} + volumeName: "{{ .Values.pushgateway.persistentVolume.volumeName }}" +{{- end }} {{- end -}} {{- end -}} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/service.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/service.yaml index f05f17c42..a49f47b27 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/service.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/pushgateway/service.yaml @@ -35,6 +35,9 @@ spec: port: {{ .Values.pushgateway.service.servicePort }} protocol: TCP targetPort: 9091 + {{- if .Values.pushgateway.service.nodePort }} + nodePort: {{ .Values.pushgateway.service.nodePort }} + {{- end }} selector: {{- include "prometheus.pushgateway.matchLabels" . | nindent 4 }} type: "{{ .Values.pushgateway.service.type }}" diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/cm.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/cm.yaml index e012694fc..92693edba 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/cm.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/cm.yaml @@ -5,10 +5,17 @@ kind: ConfigMap metadata: labels: {{- include "prometheus.server.labels" . | nindent 4 }} + {{- with .Values.server.extraConfigmapLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} name: {{ template "prometheus.server.fullname" . }} {{ include "prometheus.namespace" . | indent 2 }} data: + allow-snippet-annotations: "false" {{- $root := . -}} +{{- range $key, $value := .Values.ruleFiles }} + {{ $key }}: {{- toYaml $value | indent 2 }} +{{- end }} {{- range $key, $value := .Values.serverFiles }} {{ $key }}: | {{- if eq $key "prometheus.yml" }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/deploy.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/deploy.yaml index b7c3ffb57..45de5d187 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/deploy.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/deploy.yaml @@ -56,6 +56,10 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.prometheus.name }} image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" + {{- with .Values.configmapReload.prometheus.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload @@ -65,6 +69,10 @@ spec: {{- range .Values.configmapReload.prometheus.extraVolumeDirs }} - --volume-dir={{ . }} {{- end }} + {{- if .Values.configmapReload.prometheus.containerPort }} + ports: + - containerPort: {{ .Values.configmapReload.prometheus.containerPort }} + {{- end }} resources: {{ toYaml .Values.configmapReload.prometheus.resources | indent 12 }} volumeMounts: @@ -87,9 +95,9 @@ spec: {{ toYaml .Values.server.env | indent 12}} {{- end }} args: - {{- if .Values.server.prefixURL }} - - --web.route-prefix={{ .Values.server.prefixURL }} - {{- end }} + {{- if .Values.server.defaultFlagsOverride }} + {{ toYaml .Values.server.defaultFlagsOverride | nindent 12}} + {{- else }} {{- if .Values.server.retention }} - --storage.tsdb.retention.time={{ .Values.server.retention }} {{- end }} @@ -107,23 +115,27 @@ spec: {{- range $key, $value := .Values.server.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} + {{- if .Values.server.prefixURL }} + - --web.route-prefix={{ .Values.server.prefixURL }} + {{- end }} {{- if .Values.server.baseURL }} - --web.external-url={{ .Values.server.baseURL }} {{- end }} + {{- end }} ports: - containerPort: 9090 + {{- if .Values.server.hostPort }} + hostPort: {{ .Values.server.hostPort }} + {{- end }} readinessProbe: {{- if not .Values.server.tcpSocketProbeEnabled }} httpGet: path: {{ .Values.server.prefixURL }}/-/ready port: 9090 scheme: {{ .Values.server.probeScheme }} - {{- if .Values.server.probeHeaders }} + {{- with .Values.server.probeHeaders }} httpHeaders: - {{- range .Values.server.probeHeaders}} - - name: {{ .name }} - value: {{ .value }} - {{- end }} +{{- toYaml . | nindent 14 }} {{- end }} {{- else }} tcpSocket: @@ -140,12 +152,9 @@ spec: path: {{ .Values.server.prefixURL }}/-/healthy port: 9090 scheme: {{ .Values.server.probeScheme }} - {{- if .Values.server.probeHeaders }} + {{- with .Values.server.probeHeaders }} httpHeaders: - {{- range .Values.server.probeHeaders}} - - name: {{ .name }} - value: {{ .value }} - {{- end }} +{{- toYaml . | nindent 14 }} {{- end }} {{- else }} tcpSocket: @@ -207,6 +216,10 @@ spec: {{- if .Values.server.extraVolumeMounts }} {{ toYaml .Values.server.extraVolumeMounts | nindent 12 }} {{- end }} + {{- with .Values.server.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.server.sidecarContainers }} {{- range $name, $spec := .Values.server.sidecarContainers }} - name: {{ $name }} @@ -217,8 +230,10 @@ spec: {{- end }} {{- end }} {{- end }} - hostNetwork: {{ .Values.server.hostNetwork }} - {{- if .Values.server.dnsPolicy }} + {{- if .Values.server.hostNetwork }} + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + {{- else }} dnsPolicy: {{ .Values.server.dnsPolicy }} {{- end }} {{- if .Values.imagePullSecrets }} @@ -237,9 +252,9 @@ spec: dnsConfig: {{ toYaml .Values.server.dnsConfig | indent 8 }} {{- end }} - {{- if .Values.server.securityContext }} + {{- with .Values.server.securityContext }} securityContext: -{{ toYaml .Values.server.securityContext | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.server.tolerations }} tolerations: @@ -252,8 +267,13 @@ spec: terminationGracePeriodSeconds: {{ .Values.server.terminationGracePeriodSeconds }} volumes: - name: config-volume + {{- if empty .Values.server.configFromSecret }} configMap: name: {{ if .Values.server.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.server.configMapOverrideName }}{{- else }}{{ template "prometheus.server.fullname" . }}{{- end }} + {{- else }} + secret: + secretName: {{ .Values.server.configFromSecret }} + {{- end }} {{- range .Values.server.extraHostPathMounts }} - name: {{ .name }} hostPath: diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/extra-manifests.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/extra-manifests.yaml new file mode 100644 index 000000000..7560f5a6a --- /dev/null +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/extra-manifests.yaml @@ -0,0 +1,9 @@ +{{ range .Values.server.extraObjects }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} + +{{- range .Values.server.extraTemplates }} +--- +{{ tpl . $ -}} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/pdb.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/pdb.yaml index 364cb5b49..5a6ab42f8 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/pdb.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.server.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 +apiVersion: {{ template "prometheus.podDisruptionBudget.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ template "prometheus.server.fullname" . }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/psp.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/psp.yaml index e2b885f16..e2e926ed4 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/psp.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/psp.yaml @@ -1,14 +1,15 @@ {{- if and .Values.server.enabled .Values.rbac.create .Values.podSecurityPolicy.enabled }} -apiVersion: {{ template "prometheus.podSecurityPolicy.apiVersion" . }} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy" }} +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus.server.fullname" . }} labels: {{- include "prometheus.server.labels" . | nindent 4 }} + {{- with .Values.server.podSecurityPolicy.annotations }} annotations: -{{- if .Values.server.podSecurityPolicy.annotations }} -{{ toYaml .Values.server.podSecurityPolicy.annotations | indent 4 }} -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: privileged: false allowPrivilegeEscalation: false @@ -49,3 +50,4 @@ spec: max: 65535 readOnlyRootFilesystem: false {{- end }} +{{- end }} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/pvc.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/pvc.yaml index a7355365c..d86fdda80 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/pvc.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/pvc.yaml @@ -33,6 +33,9 @@ spec: selector: {{- toYaml .Values.server.persistentVolume.selector | nindent 4 }} {{- end -}} +{{- if .Values.server.persistentVolume.volumeName }} + volumeName: "{{ .Values.server.persistentVolume.volumeName }}" +{{- end -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/service.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/service.yaml index 68f988927..01c5a4a8a 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/service.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.server.enabled -}} +{{- if and .Values.server.enabled .Values.server.service.enabled -}} apiVersion: v1 kind: Service metadata: diff --git a/charts/gitlab/gitlab/charts/prometheus/templates/server/sts.yaml b/charts/gitlab/gitlab/charts/prometheus/templates/server/sts.yaml index e6fa71021..f137d214e 100644 --- a/charts/gitlab/gitlab/charts/prometheus/templates/server/sts.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/templates/server/sts.yaml @@ -56,6 +56,10 @@ spec: - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.prometheus.name }} image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" + {{- with .Values.configmapReload.prometheus.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload @@ -65,6 +69,10 @@ spec: {{- range .Values.configmapReload.prometheus.extraVolumeDirs }} - --volume-dir={{ . }} {{- end }} + {{- if .Values.configmapReload.prometheus.containerPort }} + ports: + - containerPort: {{ .Values.configmapReload.prometheus.containerPort }} + {{- end }} resources: {{ toYaml .Values.configmapReload.prometheus.resources | indent 12 }} volumeMounts: @@ -87,6 +95,9 @@ spec: {{ toYaml .Values.server.env | indent 12}} {{- end }} args: + {{- if .Values.server.defaultFlagsOverride }} + {{ toYaml .Values.server.defaultFlagsOverride | nindent 12}} + {{- else }} {{- if .Values.server.prefixURL }} - --web.route-prefix={{ .Values.server.prefixURL }} {{- end }} @@ -110,14 +121,22 @@ spec: {{- if .Values.server.baseURL }} - --web.external-url={{ .Values.server.baseURL }} {{- end }} + {{- end }} ports: - containerPort: 9090 + {{- if .Values.server.hostPort }} + hostPort: {{ .Values.server.hostPort }} + {{- end }} readinessProbe: {{- if not .Values.server.tcpSocketProbeEnabled }} httpGet: path: {{ .Values.server.prefixURL }}/-/ready port: 9090 scheme: {{ .Values.server.probeScheme }} + {{- with .Values.server.probeHeaders }} + httpHeaders: +{{- toYaml . | nindent 14 }} + {{- end }} {{- else }} tcpSocket: port: 9090 @@ -133,6 +152,10 @@ spec: path: {{ .Values.server.prefixURL }}/-/healthy port: 9090 scheme: {{ .Values.server.probeScheme }} + {{- with .Values.server.probeHeaders }} + httpHeaders: +{{- toYaml . | nindent 14 }} + {{- end }} {{- else }} tcpSocket: port: 9090 @@ -142,6 +165,28 @@ spec: timeoutSeconds: {{ .Values.server.livenessProbeTimeout }} failureThreshold: {{ .Values.server.livenessProbeFailureThreshold }} successThreshold: {{ .Values.server.livenessProbeSuccessThreshold }} + {{- if .Values.server.startupProbe.enabled }} + startupProbe: + {{- if not .Values.server.tcpSocketProbeEnabled }} + httpGet: + path: {{ .Values.server.prefixURL }}/-/healthy + port: 9090 + scheme: {{ .Values.server.probeScheme }} + {{- if .Values.server.probeHeaders }} + httpHeaders: + {{- range .Values.server.probeHeaders}} + - name: {{ .name }} + value: {{ .value }} + {{- end }} + {{- end }} + {{- else }} + tcpSocket: + port: 9090 + {{- end }} + failureThreshold: {{ .Values.server.startupProbe.failureThreshold }} + periodSeconds: {{ .Values.server.startupProbe.periodSeconds }} + timeoutSeconds: {{ .Values.server.startupProbe.timeoutSeconds }} + {{- end }} resources: {{ toYaml .Values.server.resources | indent 12 }} volumeMounts: @@ -171,6 +216,10 @@ spec: {{- if .Values.server.extraVolumeMounts }} {{ toYaml .Values.server.extraVolumeMounts | nindent 12 }} {{- end }} + {{- with .Values.server.containerSecurityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.server.sidecarContainers }} {{- range $name, $spec := .Values.server.sidecarContainers }} - name: {{ $name }} @@ -201,9 +250,9 @@ spec: dnsConfig: {{ toYaml .Values.server.dnsConfig | indent 8 }} {{- end }} - {{- if .Values.server.securityContext }} + {{- with .Values.server.securityContext }} securityContext: -{{ toYaml .Values.server.securityContext | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.server.tolerations }} tolerations: @@ -216,8 +265,13 @@ spec: terminationGracePeriodSeconds: {{ .Values.server.terminationGracePeriodSeconds }} volumes: - name: config-volume + {{- if empty .Values.server.configFromSecret }} configMap: name: {{ if .Values.server.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.server.configMapOverrideName }}{{- else }}{{ template "prometheus.server.fullname" . }}{{- end }} + {{- else }} + secret: + secretName: {{ .Values.server.configFromSecret }} + {{- end }} {{- range .Values.server.extraHostPathMounts }} - name: {{ .name }} hostPath: @@ -260,6 +314,10 @@ spec: annotations: {{ toYaml .Values.server.persistentVolume.annotations | indent 10 }} {{- end }} + {{- if .Values.server.persistentVolume.labels }} + labels: +{{ toYaml .Values.server.persistentVolume.labels | indent 10 }} + {{- end }} spec: accessModes: {{ toYaml .Values.server.persistentVolume.accessModes | indent 10 }} diff --git a/charts/gitlab/gitlab/charts/prometheus/values.yaml b/charts/gitlab/gitlab/charts/prometheus/values.yaml index ca6114720..3b373826b 100644 --- a/charts/gitlab/gitlab/charts/prometheus/values.yaml +++ b/charts/gitlab/gitlab/charts/prometheus/values.yaml @@ -48,13 +48,18 @@ alertmanager: ## image: repository: quay.io/prometheus/alertmanager - tag: v0.23.0 + tag: v0.24.0 pullPolicy: IfNotPresent ## alertmanager priorityClassName ## priorityClassName: "" + ## Custom HTTP headers for Readiness Probe + ## + ## Useful for providing HTTP Basic Auth to healthchecks + probeHeaders: [] + ## Additional alertmanager container arguments ## extraArgs: {} @@ -85,6 +90,13 @@ alertmanager: # secretName: alertmanager-secret-files # readOnly: true + ## Additional alertmanager Configmap mounts + extraConfigmapMounts: [] + # - name: template-files + # mountPath: /etc/config/templates.d + # configMap: alertmanager-template-files + # readOnly: true + ## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}} ## Defining configMapOverrideName will cause templates/alertmanager-configmap.yaml ## to NOT generate a ConfigMap resource @@ -243,6 +255,11 @@ alertmanager: # matchExpressions: # - { key: environment, operator: In, values: [ dev ] } + ## Persistent Volume Name + ## Useful if Persistent Volumes have been provisioned in advance and you want to use a specific one + ## + # volumeName: "" + emptyDir: ## alertmanager emptyDir volume size limit ## @@ -336,6 +353,10 @@ alertmanager: runAsGroup: 65534 fsGroup: 65534 + ## Security context to be added to alertmanager container + ## + containerSecurityContext: {} + service: annotations: {} labels: {} @@ -381,6 +402,8 @@ configmapReload: tag: v0.5.0 pullPolicy: IfNotPresent + # containerPort: 9533 + ## Additional configmap-reload container arguments ## extraArgs: {} @@ -398,6 +421,8 @@ configmapReload: # configMap: prometheus-alerts # readOnly: true + ## Security context to be added to configmap-reload container + containerSecurityContext: {} ## configmap-reload resource requests and limits ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -419,6 +444,8 @@ configmapReload: tag: v0.5.0 pullPolicy: IfNotPresent + # containerPort: 9533 + ## Additional configmap-reload container arguments ## extraArgs: {} @@ -436,6 +463,8 @@ configmapReload: # configMap: prometheus-alerts # readOnly: true + ## Security context to be added to configmap-reload container + containerSecurityContext: {} ## configmap-reload resource requests and limits ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -477,7 +506,7 @@ nodeExporter: ## image: repository: quay.io/prometheus/node-exporter - tag: v1.3.0 + tag: v1.3.1 pullPolicy: IfNotPresent ## Specify if a Pod Security Policy for node-exporter must be created @@ -566,7 +595,9 @@ nodeExporter: # requests: # cpu: 100m # memory: 30Mi - + container: + securityContext: + allowPrivilegeEscalation: false # Custom DNS configuration to be added to node-exporter pods dnsConfig: {} # nameservers: @@ -594,7 +625,7 @@ nodeExporter: # Exposed as a headless service: # https://kubernetes.io/docs/concepts/services-networking/service/#headless-services - clusterIP: None + clusterIP: "" ## List of IP addresses at which the node-exporter service is available ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips @@ -652,7 +683,7 @@ server: ## image: repository: quay.io/prometheus/prometheus - tag: v2.31.1 + tag: v2.39.1 pullPolicy: IfNotPresent ## prometheus server priorityClassName @@ -691,6 +722,11 @@ server: ## key: username env: [] + # List of flags to override default parameters, e.g: + # - --enable-feature=agent + # - --storage.agent.retention.max-time=30m + defaultFlagsOverride: [] + extraFlags: - web.enable-lifecycle ## web.enable-admin-api flag controls access to the administrative HTTP API which includes functionality such as @@ -731,6 +767,8 @@ server: ## ## Useful for providing HTTP Basic Auth to healthchecks probeHeaders: [] + # - name: "Authorization" + # value: "Bearer ABCDEabcde12345" ## Additional Prometheus server container arguments ## @@ -779,6 +817,9 @@ server: ## configMapOverrideName: "" + ## Extra labels for Prometheus server ConfigMap (ConfigMap that holds serverFiles) + extraConfigmapLabels: {} + ingress: ## If true, Prometheus server Ingress will be created ## @@ -878,6 +919,10 @@ server: accessModes: - ReadWriteOnce + ## Prometheus server data Persistent Volume labels + ## + labels: {} + ## Prometheus server data Persistent Volume annotations ## annotations: {} @@ -926,6 +971,11 @@ server: # matchExpressions: # - { key: environment, operator: In, values: [ dev ] } + ## Persistent Volume Name + ## Useful if Persistent Volumes have been provisioned in advance and you want to use a specific one + ## + # volumeName: "" + emptyDir: ## Prometheus server emptyDir volume size limit ## @@ -1025,9 +1075,12 @@ server: ## hostNetwork: false - # When hostNetwork is enabled, you probably want to set this to ClusterFirstWithHostNet + # When hostNetwork is enabled, this will set to ClusterFirstWithHostNet automatically dnsPolicy: ClusterFirst + # Use hostPort + # hostPort: 9090 + ## Vertical Pod Autoscaler config ## Ref: https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler verticalAutoscaler: @@ -1048,6 +1101,7 @@ server: # - name: ndots # value: "2" # - name: edns0 + ## Security context to be added to server pods ## securityContext: @@ -1056,7 +1110,15 @@ server: runAsGroup: 65534 fsGroup: 65534 + ## Security context to be added to server container + ## + containerSecurityContext: {} + service: + ## If false, no Service will be created for the Prometheus server + ## + enabled: true + annotations: {} labels: {} clusterIP: "" @@ -1093,6 +1155,25 @@ server: ## retention: "15d" + ## Array of extra Kubernetes manifests, in form of YAML object, + ## if you want to deploy + extraObjects: [] + # - apiVersion: v1 + # kind: ConfigMap + # metadata: + # name: '{{ template "prometheus.name" . }}-extra-config' + + ## Array of extra Kubernetes manifest, in form of template string, + ## if you want to deploy + extraTemplates: [] + # - | + # apiVersion: v1 + # kind: ConfigMap + # metadata: + # name: extra-config + # labels: + # {{- include "prometheus.server.labels" . | nindent 4 }} + pushgateway: ## If false, pushgateway will not be installed ## @@ -1111,7 +1192,7 @@ pushgateway: ## image: repository: prom/pushgateway - tag: v1.4.2 + tag: v1.4.3 pullPolicy: IfNotPresent ## pushgateway priorityClassName @@ -1256,6 +1337,9 @@ pushgateway: runAsUser: 65534 runAsNonRoot: true + ## Security context to be added to push-gateway container + containerSecurityContext: {} + service: annotations: prometheus.io/probe: pushgateway @@ -1276,6 +1360,13 @@ pushgateway: # strategy: # type: Recreate + ## Custom HTTP headers for Liveness/Readiness/Startup Probe + ## + ## Useful for providing HTTP Basic Auth to healthchecks + probeHeaders: [] + # - name: "Authorization" + # value: "Bearer ABCDEabcde12345" + persistentVolume: ## If true, pushgateway will create/use a Persistent Volume Claim ## @@ -1326,6 +1417,10 @@ pushgateway: ## subPath: "" + ## Persistent Volume Name + ## Useful if Persistent Volumes have been provisioned in advance and you want to use a specific one + ## + # volumeName: "" ## alertmanager ConfigMap entries ## @@ -1346,6 +1441,9 @@ alertmanagerFiles: receiver: default-receiver repeat_interval: 3h +## Prometheus server ConfigMap entries for rule files (allow prometheus labels interpolation) +ruleFiles: {} + ## Prometheus server ConfigMap entries ## serverFiles: @@ -1528,6 +1626,7 @@ serverFiles: # * `prometheus.io/param_`: If the metrics endpoint uses parameters # then you can set any parameter - job_name: 'kubernetes-service-endpoints' + honor_labels: true kubernetes_sd_configs: - role: endpoints @@ -1550,7 +1649,7 @@ serverFiles: - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port] action: replace target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 - action: labelmap regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+) @@ -1582,6 +1681,7 @@ serverFiles: # * `prometheus.io/param_`: If the metrics endpoint uses parameters # then you can set any parameter - job_name: 'kubernetes-service-endpoints-slow' + honor_labels: true scrape_interval: 5m scrape_timeout: 30s @@ -1604,7 +1704,7 @@ serverFiles: - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port] action: replace target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 - action: labelmap regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+) @@ -1639,6 +1739,7 @@ serverFiles: # # * `prometheus.io/probe`: Only probe services that have a value of `true` - job_name: 'kubernetes-services' + honor_labels: true metrics_path: /probe params: @@ -1676,6 +1777,7 @@ serverFiles: # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. # * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. - job_name: 'kubernetes-pods' + honor_labels: true kubernetes_sd_configs: - role: pod @@ -1697,7 +1799,7 @@ serverFiles: regex: (.+) - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 target_label: __address__ - action: labelmap @@ -1727,6 +1829,7 @@ serverFiles: # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. # * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. - job_name: 'kubernetes-pods-slow' + honor_labels: true scrape_interval: 5m scrape_timeout: 30s @@ -1748,7 +1851,7 @@ serverFiles: regex: (.+) - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 target_label: __address__ - action: labelmap @@ -1800,3 +1903,13 @@ networkPolicy: # Force namespace of namespaced resources forceNamespace: null + +# Extra manifests to deploy as an array +extraManifests: [] + # - apiVersion: v1 + # kind: ConfigMap + # metadata: + # labels: + # name: prometheus-extra + # data: + # extra-data: "value" diff --git a/charts/gitlab/gitlab/charts/registry/Chart.yaml b/charts/gitlab/gitlab/charts/registry/Chart.yaml index 8ccb6f569..ddd25099f 100644 --- a/charts/gitlab/gitlab/charts/registry/Chart.yaml +++ b/charts/gitlab/gitlab/charts/registry/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v3.67.0-gitlab +appVersion: v3.69.0-gitlab description: Stateless, highly scalable application that stores and lets you distribute container images home: https://docs.gitlab.com/ee/user/packages/container_registry diff --git a/charts/gitlab/gitlab/charts/registry/templates/deployment.yaml b/charts/gitlab/gitlab/charts/registry/templates/deployment.yaml index 1b43324c6..fb8afe0c7 100644 --- a/charts/gitlab/gitlab/charts/registry/templates/deployment.yaml +++ b/charts/gitlab/gitlab/charts/registry/templates/deployment.yaml @@ -51,9 +51,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 8 }} {{- end }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - fsGroup: {{ .Values.securityContext.fsGroup }} + {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: podAntiAffinity: diff --git a/charts/gitlab/gitlab/charts/registry/values.yaml b/charts/gitlab/gitlab/charts/registry/values.yaml index 22ebc8532..b75ee1317 100644 --- a/charts/gitlab/gitlab/charts/registry/values.yaml +++ b/charts/gitlab/gitlab/charts/registry/values.yaml @@ -1,6 +1,6 @@ image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry - tag: 'v3.67.0-gitlab' + tag: 'v3.69.0-gitlab' # pullPolicy: IfNotPresent # pullSecrets: [] @@ -226,7 +226,7 @@ tokenService: 'container_registry' # This must match your GitLab Rails configuration tokenIssuer: 'gitlab-issuer' # Must to be `false` to support Windows clients -# See https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3964 +# See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/3964 authAutoRedirect: false maxUnavailable: 1 @@ -333,6 +333,7 @@ health: securityContext: runAsUser: 1000 fsGroup: 1000 + # fsGroupChangePolicy: OnRootMismatch # Disable reporting by default # https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md#reporting diff --git a/charts/gitlab/gitlab/requirements.lock b/charts/gitlab/gitlab/requirements.lock index c8bfff418..3c6cd7a91 100644 --- a/charts/gitlab/gitlab/requirements.lock +++ b/charts/gitlab/gitlab/requirements.lock @@ -16,13 +16,13 @@ dependencies: version: v1.5.4 - name: prometheus repository: https://prometheus-community.github.io/helm-charts - version: 15.0.4 + version: 15.18.0 - name: postgresql repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami version: 8.9.4 - name: gitlab-runner repository: https://charts.gitlab.io/ - version: 0.50.1 + version: 0.51.0 - name: grafana repository: https://grafana.github.io/helm-charts version: 6.11.0 @@ -32,5 +32,5 @@ dependencies: - name: nginx-ingress repository: "" version: '*.*.*' -digest: sha256:49d31a900c604ab654cbf4fc4be5200921f56731c6659c7cf1cd3abd180419c0 -generated: "2023-03-09T21:42:17.086295055Z" +digest: sha256:d49501b548466ab2e6b6bad8a1a388e07120dcaa3d127db06bd23381fd2583d6 +generated: "2023-03-22T13:23:51.422389951Z" diff --git a/charts/gitlab/gitlab/requirements.yaml b/charts/gitlab/gitlab/requirements.yaml index 14c9128ff..bdde5c006 100644 --- a/charts/gitlab/gitlab/requirements.yaml +++ b/charts/gitlab/gitlab/requirements.yaml @@ -13,7 +13,7 @@ dependencies: condition: certmanager.install alias: certmanager - name: prometheus - version: 15.0.4 + version: 15.18.0 repository: https://prometheus-community.github.io/helm-charts condition: prometheus.install - name: postgresql @@ -21,7 +21,7 @@ dependencies: repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami condition: postgresql.install - name: gitlab-runner - version: 0.50.1 + version: 0.51.0 repository: https://charts.gitlab.io/ condition: gitlab-runner.install - name: grafana diff --git a/charts/gitlab/gitlab/templates/_certificates.tpl b/charts/gitlab/gitlab/templates/_certificates.tpl index 61405f481..1a32d68c6 100644 --- a/charts/gitlab/gitlab/templates/_certificates.tpl +++ b/charts/gitlab/gitlab/templates/_certificates.tpl @@ -9,6 +9,7 @@ - name: certificates image: {{ include "gitlab.certificates.image" . }} {{- include "gitlab.image.pullPolicy" $imageCfg | indent 2 }} + {{- include "gitlab.init.containerSecurityContext" . | indent 2 }} env: {{- include "gitlab.extraEnv" . | nindent 2 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 2 }} diff --git a/charts/gitlab/gitlab/templates/_checkConfig.tpl b/charts/gitlab/gitlab/templates/_checkConfig.tpl index 66d37a66f..63051c1cb 100644 --- a/charts/gitlab/gitlab/templates/_checkConfig.tpl +++ b/charts/gitlab/gitlab/templates/_checkConfig.tpl @@ -49,6 +49,7 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{- $messages = append $messages (include "gitlab.checkConfig.gitaly.storageNames" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.gitaly.tls" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.gitaly.extern.repos" .) -}} +{{- $messages = append $messages (include "gitlab.checkConfig.gitaly.gpgSigning" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.praefect.storageNames" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.praefect.defaultReplicationFactor" .) -}} @@ -93,6 +94,7 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{/* _checkConfig_gitlab_shell.tpl*/}} {{- $messages = append $messages (include "gitlab.checkConfig.gitlabShell.proxyPolicy" .) -}} +{{- $messages = append $messages (include "gitlab.checkConfig.gitlabShell.metrics" .) -}} {{/* other checks */}} {{- $messages = append $messages (include "gitlab.checkConfig.multipleRedis" .) -}} diff --git a/charts/gitlab/gitlab/templates/_checkConfig_gitaly.tpl b/charts/gitlab/gitlab/templates/_checkConfig_gitaly.tpl index 58beba07b..93e50f052 100644 --- a/charts/gitlab/gitlab/templates/_checkConfig_gitaly.tpl +++ b/charts/gitlab/gitlab/templates/_checkConfig_gitaly.tpl @@ -99,3 +99,14 @@ gitaly: {{- end -}} {{- end -}} {{/* END gitlab.checkConfig.gitaly.extern.repos */}} + +{{/* Check that both GPG secret and key are set*/}} +{{- define "gitlab.checkConfig.gitaly.gpgSigning" -}} +{{- if and $.Values.global.gitaly.enabled $.Values.gitlab.gitaly.gpgSigning.enabled -}} +{{- if not (and $.Values.gitlab.gitaly.gpgSigning.secret $.Values.gitlab.gitaly.gpgSigning.key) -}} +gitaly: + secret and key must be set if gitlab.gitaly.gpgSigning.enabled is set +{{- end -}} +{{- end -}} +{{- end -}} +{{/* END gitlab.checkConfig.gitaly.gpgSigning */}} diff --git a/charts/gitlab/gitlab/templates/_checkConfig_gitlab_shell.tpl b/charts/gitlab/gitlab/templates/_checkConfig_gitlab_shell.tpl index 407ee8858..68ee942f6 100644 --- a/charts/gitlab/gitlab/templates/_checkConfig_gitlab_shell.tpl +++ b/charts/gitlab/gitlab/templates/_checkConfig_gitlab_shell.tpl @@ -15,3 +15,18 @@ gitlab-shell: {{- end -}} {{- end -}} {{/* END "gitlab.checkConfig.gitlabShell.proxyPolicy" */}} + +{{- define "gitlab.checkConfig.gitlabShell.metrics" -}} +{{- $shell := (index .Values "gitlab" "gitlab-shell") -}} +{{/* +Metrics are only supported for "gitlab-shell" when "gitlab-sshd" +is used as the SSH daemon, as the OpenSSH daemon does not provide +viable collectable metrics. +*/}} +{{- if and $shell.metrics.enabled (not (eq $shell.sshDaemon "gitlab-sshd")) }} +gitlab-shell: + gitlab.gitlab-shell.metrics.enabled is true, but gitlab.gitlab-shell.sshDaemon is set to "{{- $shell.sshDaemon -}}". + Metrics are not supported for the "{{- $shell.sshDaemon -}}". + Either disable metrics or set sshDaemon to "gitlab-sshd". +{{- end -}} +{{- end -}} diff --git a/charts/gitlab/gitlab/templates/_deprecations.tpl b/charts/gitlab/gitlab/templates/_deprecations.tpl index 9e08a28ff..0eac5fc72 100644 --- a/charts/gitlab/gitlab/templates/_deprecations.tpl +++ b/charts/gitlab/gitlab/templates/_deprecations.tpl @@ -360,8 +360,8 @@ sidekiq: {{- define "gitlab.deprecate.sidekiq.pods.updateStrategy" -}} {{- range $index, $pod := .Values.gitlab.sidekiq.pods -}} -{{- if hasKey $pod "updateStrategy" -}} -{{ $pod.name }}: +{{- if hasKey $pod "updateStrategy" }} +sidekiq.pods[{{ $index }}] ({{ $pod.name }}): The configuration of 'gitlab.sidekiq.pods[{{ $index }}].updateStrategy' has moved. Please use 'gitlab.sidekiq.pods[{{ $index }}].deployment.strategy' instead. {{- end -}} {{- end -}} @@ -393,8 +393,8 @@ sidekiq: {{- define "gitlab.deprecate.sidekiq.pods.cluster" -}} {{- range $index, $pod := .Values.gitlab.sidekiq.pods -}} -{{- if hasKey $pod "cluster" -}} -{{ $pod.name }}: +{{- if hasKey $pod "cluster" }} +sidekiq.pods[{{ $index }}] ({{ $pod.name }}): The configuration of 'gitlab.sidekiq.pods[{{ $index }}].cluster' should be removed. Sidekiq is now always in cluster mode. {{- end -}} {{- end -}} diff --git a/charts/gitlab/gitlab/templates/_helpers.tpl b/charts/gitlab/gitlab/templates/_helpers.tpl index a218ba611..beb5c4b23 100644 --- a/charts/gitlab/gitlab/templates/_helpers.tpl +++ b/charts/gitlab/gitlab/templates/_helpers.tpl @@ -638,3 +638,46 @@ emptyDir: {} emptyDir: {{ toYaml $values | nindent 2 }} {{- end -}} {{- end -}} + +{{/* +Return init container specific securityContext template +*/}} +{{- define "gitlab.init.containerSecurityContext" }} +{{- if .Values.init.containerSecurityContext }} +securityContext: + {{- toYaml .Values.init.containerSecurityContext | nindent 2 }} +{{- end }} +{{- end }} + +{{/* +Return container specific securityContext template +*/}} +{{- define "gitlab.containerSecurityContext" }} +{{- if .Values.containerSecurityContext }} +securityContext: + {{- toYaml .Values.containerSecurityContext | nindent 2 }} +{{- end }} +{{- end }} +Return a PodSecurityContext definition. + +Usage: + {{ include "gitlab.podSecurityContext" .Values.securityContext }} +*/}} +{{- define "gitlab.podSecurityContext" -}} +{{- $psc := . }} +{{- if $psc }} +securityContext: +{{- if not (empty $psc.runAsUser) }} + runAsUser: {{ $psc.runAsUser }} +{{- end }} +{{- if not (empty $psc.runAsGroup) }} + runAsGroup: {{ $psc.runAsGroup }} +{{- end }} +{{- if not (empty $psc.fsGroup) }} + fsGroup: {{ $psc.fsGroup }} +{{- end }} +{{- if not (empty $psc.fsGroupChangePolicy) }} + fsGroupChangePolicy: {{ $psc.fsGroupChangePolicy }} +{{- end }} +{{- end }} +{{- end -}} diff --git a/charts/gitlab/gitlab/templates/_registry.tpl b/charts/gitlab/gitlab/templates/_registry.tpl index 404ff7716..6f5665543 100644 --- a/charts/gitlab/gitlab/templates/_registry.tpl +++ b/charts/gitlab/gitlab/templates/_registry.tpl @@ -11,7 +11,7 @@ Return the registry certificate secret name Return the registry TLS secret name */}} {{- define "gitlab.registry.tls.secret" -}} -{{- default (printf "%s-registry-tls" .Release.Name) .Values.global.registry.tls.secretName | quote -}} +{{- coalesce .Values.tls.secretName .Values.global.registry.tls.secretName (printf "%s-registry-tls" .Release.Name) | quote -}} {{- end -}} {{/* diff --git a/charts/gitlab/gitlab/values.yaml b/charts/gitlab/gitlab/values.yaml index 3cfdc1205..7ade25ea7 100644 --- a/charts/gitlab/gitlab/values.yaml +++ b/charts/gitlab/gitlab/values.yaml @@ -40,7 +40,7 @@ global: edition: ee ## https://docs.gitlab.com/charts/charts/globals#gitlab-version - gitlabVersion: "15.9.3" + gitlabVersion: "15.10.0" ## https://docs.gitlab.com/charts/charts/globals#application-resource application: @@ -911,7 +911,8 @@ prometheus: retention: 15d strategy: type: Recreate - # + image: + tag: v2.38.0 serverFiles: prometheus.yml: scrape_configs: diff --git a/charts/kubemq/kubemq-cluster/.helmignore b/charts/kubemq/kubemq-cluster/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/kubemq/kubemq-cluster/Chart.lock b/charts/kubemq/kubemq-cluster/Chart.lock new file mode 100644 index 000000000..29fd21449 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: kubemq-crds + repository: https://kubemq-io.github.io/charts + version: 2.3.7 +- name: kubemq-controller + repository: https://kubemq-io.github.io/charts + version: 1.9.3 +digest: sha256:c9b644d18249502f1f7ceb749b408da3844e9a5005da89ed03079cbed68de63b +generated: "2023-03-18T13:35:49.5815949+02:00" diff --git a/charts/kubemq/kubemq-cluster/Chart.yaml b/charts/kubemq/kubemq-cluster/Chart.yaml new file mode 100644 index 000000000..58949c6e6 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/Chart.yaml @@ -0,0 +1,16 @@ +annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ Cluster + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-cluster +apiVersion: v2 +appVersion: 2.3.7 +description: A Helm chart for KubeMQ Cluster, Kubernetes Message Queue Broker +icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg +maintainers: +- email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io +name: kubemq-cluster +type: application +version: 2.3.7 diff --git a/charts/kubemq/kubemq-cluster/README.md b/charts/kubemq/kubemq-cluster/README.md new file mode 100644 index 000000000..5cc0edafa --- /dev/null +++ b/charts/kubemq/kubemq-cluster/README.md @@ -0,0 +1,26 @@ +# kubemq-cluster + +`kubemq-cluster` is the Helm chart that installs the KubeMQ Cluster. + +## Installing + +For example: +```console +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +$ helm install --create-namespace -n kubemq kubemq-cluster kubemq-charts/kubemq-cluster +``` +## Upgrading the charts + +Please refer to the release notes of each version of the helm charts. +These can be found [here](https://github.com/kubemq/helm-charts/releases). + +## Uninstalling the charts + +To uninstall/delete kubemq-cluster use the following command: + +```console +$ helm uninstall -n kubemq kubemq-cluster +``` +The commands remove all the Kubernetes components associated with the chart. + +If you want to keep the history use `--keep-history` flag. diff --git a/charts/kubemq/kubemq-cluster/app-readme.md b/charts/kubemq/kubemq-cluster/app-readme.md new file mode 100644 index 000000000..c6ad8983c --- /dev/null +++ b/charts/kubemq/kubemq-cluster/app-readme.md @@ -0,0 +1,43 @@ +# KubeMQ Charts +KubeMQ is a Cloud Native, enterprise grade message queue broker for distributed services architecture. + +KubeMQ is delivered as a small, lightweight Docker container, designed for any type of workload and architecture running in Kubernetes or any other containers orchestration system which support Docker. + +## HELM +KubeMQ Helm charts required Helm v3. Please download/upgrade from [https://github.com/helm/helm](https://github.com/helm/helm) + +## Add KubeMQ Helm Repository + +``` +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +``` + +Verify KubeMQ helm repository charts is properly configured by: + +## Update KubeMQ Helm Repository +``` +$ helm repo update +``` + +## Install KubeMQ Cluster Chart + +``` console +$ helm install kubemq-crds kubemq-charts/kubemq-crds +$ helm install --wait --create-namespace -n kubemq kubemq-controller kubemq-charts/kubemq-controller +$ helm install --wait -n kubemq kubemq-cluster --set key={your-license-key} kubemq-charts/kubemq-cluster +``` + +## Uninstall KubeMQ Cluster Chart + +To uninstall/delete the kubemq-release deployment: + +``` console +$ helm uninstall -n kubemq kubemq-cluster +$ helm uninstall -n kubemq kubemq-controller +$ helm uninstall kubemq-crds +``` + +``` + +## Documentation +Please visit [https://docs.kubemq.io](https://docs.kubemq.io) for more information about KubeMQ. diff --git a/charts/kubemq/kubemq-cluster/questions.yaml b/charts/kubemq/kubemq-cluster/questions.yaml new file mode 100644 index 000000000..0b61881ac --- /dev/null +++ b/charts/kubemq/kubemq-cluster/questions.yaml @@ -0,0 +1,37 @@ +questions: + - variable: key + default: "" + required: true + label: KubeMQ Key + type: string + description: "KubeMQ Key - Register at https://kubemq.io" + group: "General Settings" + - variable: replicas + default: 3 + required: true + label: replicas + type: int + description: "Number of replicas of KubeMQ Nodes" + group: "General Settings" + - variable: image.image + default: "kubemq/kubemq:latest" + required: false + label: Image Repository + type: string + description: "KubeMQ Image Repository" + group: "General Settings" + - variable: volume.size + default: "" + required: false + label: Persistent Volume Size + type: string + description: "You can set this to a specific size, e.g. 10Gi, or leave it blank for not using persistent storage" + group: "General Settings" + - variable: volume.storageClass + default: "" + required: false + label: Persistent Volume Storage Class + type: string + description: "You can set this to a specific storage class, e.g. local-path, or leave it blank for using the default storage class" + group: "General Settings" + diff --git a/charts/kubemq/kubemq-cluster/templates/_helpers.tpl b/charts/kubemq/kubemq-cluster/templates/_helpers.tpl new file mode 100644 index 000000000..e1d2688d0 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/templates/_helpers.tpl @@ -0,0 +1,50 @@ +{{/* vim: set filetype=mustache: */}} + + +{{/*{{- define "kubemq.name" -}}*/}} +{{/*{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}*/}} +{{/*{{- end -}}*/}} + +{{- define "kubemq.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "kubemq.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Generate chart secret name +*/}} +{{- define "kubemq.secretName" -}} +{{ default (include "kubemq.fullname" .) .Values.existingSecret }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "mychart.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "mychart.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{- define "kubemq.crbName" -}} +{{- printf "kubemq-operator-%s-crb" .Release.Namespace -}} +{{- end -}} diff --git a/charts/kubemq/kubemq-cluster/templates/kubemqcluster.yaml b/charts/kubemq/kubemq-cluster/templates/kubemqcluster.yaml new file mode 100644 index 000000000..7e10cd1c8 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/templates/kubemqcluster.yaml @@ -0,0 +1,16 @@ +apiVersion: core.k8s.kubemq.io/v1beta1 +kind: KubemqCluster +metadata: + name: {{ include "kubemq.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "kubemq.fullname" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +spec: + key: {{ required "A valid kubemq is required!" .Values.key }} +{{ toYaml .Values | indent 2 }} + + + diff --git a/charts/kubemq/kubemq-cluster/templates/role_binding.yaml b/charts/kubemq/kubemq-cluster/templates/role_binding.yaml new file mode 100644 index 000000000..974bb9683 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/templates/role_binding.yaml @@ -0,0 +1,14 @@ +{{- if not (lookup "rbac.authorization.k8s.io/v1" "RoleBinding" .Release.Namespace "kubemq-cluster-rb") }} +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kubemq-cluster-rb +subjects: + - kind: ServiceAccount + name: kubemq-cluster + namespace: {{ .Release.Namespace }} +roleRef: + kind: Role + name: kubemq-cluster-role + apiGroup: rbac.authorization.k8s.io +{{- end }} diff --git a/charts/kubemq/kubemq-cluster/templates/service_account.yaml b/charts/kubemq/kubemq-cluster/templates/service_account.yaml new file mode 100644 index 000000000..6d92288f7 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/templates/service_account.yaml @@ -0,0 +1,7 @@ +{{- if not (lookup "v1" "ServiceAccount" .Release.Namespace "kubemq-cluster") }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kubemq-cluster + namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/charts/kubemq/kubemq-cluster/values.yaml b/charts/kubemq/kubemq-cluster/values.yaml new file mode 100644 index 000000000..819fa5922 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/values.yaml @@ -0,0 +1 @@ +key: diff --git a/charts/kubemq/kubemq-cluster/values_example.yaml b/charts/kubemq/kubemq-cluster/values_example.yaml new file mode 100644 index 000000000..518fa8711 --- /dev/null +++ b/charts/kubemq/kubemq-cluster/values_example.yaml @@ -0,0 +1,117 @@ +# Number of replicas of KubeMQ Nodes - https://docs.kubemq.io/configuration/cluster/default-template +replicas: 3 + +# KubeMQ license key +key: kubemq license key + +# KubeMQ license data - https://docs.kubemq.io/configuration/cluster/set-license +license: kubemq license data + +# KubeMQ Volume Configuration - https://docs.kubemq.io/configuration/cluster/set-persistence-volume +volume: + size: 10Gi + storageClass: default + +# KubeMQ docker image - https://docs.kubemq.io/configuration/cluster/set-cluster-image +image: + image: kubemq/kubemq:latest + pullPolicy: Always + + +# KubeMQ Api interface - https://docs.kubemq.io/configuration/cluster/set-api-interface +api: + disabled: false + expose: NodePort + nodePort: 32080 + port: 8080 + +# KubeMQ gRPC interface - https://docs.kubemq.io/configuration/cluster/set-grpc-interface +grpc: + disabled: false + expose: NodePort + nodePort: 32000 + port: 50000 + bodyLimit: 10000000 +# KubeMQ REST interface - https://docs.kubemq.io/configuration/cluster/set-rest-interface +rest: + bodyLimit: 1000000 + disabled: true + expose: NodePort + nodePort: 32090 + port: 9090 + +# KubeMQ Authentication Configuration - https://docs.kubemq.io/configuration/cluster/set-authentication +authentication: + key: jwt + type: jwt token type + +# KubeMQ Authorization Configuration - https://docs.kubemq.io/configuration/cluster/set-authorization +authorization: + autoReload: 300000 + policy: policy type + url: remote url + +# KubeMQ Health Configuration - https://docs.kubemq.io/configuration/cluster/set-health-probe +health: + failureThreshold: 3 + initialDelaySeconds: 3 + periodSeconds: 4 + successThreshold: 1 + timeoutSeconds: 10 + +# KubeMQ Logging Configuration - https://docs.kubemq.io/configuration/cluster/set-logs +log: + file: path to log file + level: 1 + +# KubeMQ NodeSelectors Configuration - https://docs.kubemq.io/configuration/cluster/set-node-selectors +nodeSelectors: + keys: + key: value + +# KubeMQ Queue Configuration - https://docs.kubemq.io/configuration/cluster/set-queues-settings +queue: + defaultVisibilitySeconds: 0 + defaultWaitTimeoutSeconds: 0 + maxDelaySeconds: 0 + maxExpirationSeconds: 0 + maxReQueues: 0 + maxReceiveMessagesRequest: 0 + maxVisibilitySeconds: 0 + maxWaitTimeoutSeconds: 0 + +# KubeMQ Resources Configuration - https://docs.kubemq.io/configuration/cluster/set-resources-limits +resources: + limitsCpu: "3" + limitsEphemeralStorage: 100Gi + limitsMemory: 2Gi + requestsCpu: "3" + requestsEphemeralStorage: 200Gi + requestsMemory: 4Gi + +# KubeMQ Routing Configuration - https://docs.kubemq.io/configuration/cluster/set-routing +routing: + autoReload: 300000 + data: routing data + url: routing url + +# KubeMQ Cluster Configuration - when standalone is true, KubeMQ will run as a single node +standalone: false + +# KubeMQ Store Configuration - https://docs.kubemq.io/configuration/cluster/set-store-settings +store: + clean: true + maxChannelSize: 0 + maxChannels: 0 + maxMessages: 0 + maxSubscribers: 0 + messagesRetentionMinutes: 0 + path: path to store + purgeInactiveMinutes: 0 + +# KubeMQ TLS Configuration - https://docs.kubemq.io/configuration/cluster/set-tls +tls: + ca: ca data + cert: cert data + key: key data + diff --git a/charts/kubemq/kubemq-controller/.helmignore b/charts/kubemq/kubemq-controller/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/charts/kubemq/kubemq-controller/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/kubemq/kubemq-controller/Chart.lock b/charts/kubemq/kubemq-controller/Chart.lock new file mode 100644 index 000000000..e1e72430b --- /dev/null +++ b/charts/kubemq/kubemq-controller/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: kubemq-crds + repository: https://kubemq-io.github.io/charts + version: 2.3.7 +digest: sha256:8155ecf759142d1bed539edc68b2775fdd06fa8d3121e11d88fdecbd5f4a778a +generated: "2023-03-18T13:20:55.5463101+02:00" diff --git a/charts/kubemq/kubemq-controller/Chart.yaml b/charts/kubemq/kubemq-controller/Chart.yaml new file mode 100644 index 000000000..5245f2dde --- /dev/null +++ b/charts/kubemq/kubemq-controller/Chart.yaml @@ -0,0 +1,16 @@ +annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ Controller + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-controller +apiVersion: v2 +appVersion: 1.9.3 +description: A Helm chart for KubeMQ Controller +icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg +maintainers: +- email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io +name: kubemq-controller +type: application +version: 1.9.3 diff --git a/charts/kubemq/kubemq-controller/README.md b/charts/kubemq/kubemq-controller/README.md new file mode 100644 index 000000000..aafd3b6e3 --- /dev/null +++ b/charts/kubemq/kubemq-controller/README.md @@ -0,0 +1,33 @@ +# kubemq-controller + +`kubemq-controller` is the Helm chart that installs the KubeMQ Operator and +required by the KubeMQ stack. It should be installed before installing +`kubemq-cluster` and `kubemq-connector` charts. + +## Installing + +For example: +```console +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +$ helm install -n kubemq kubemq-controller kubemq-charts/kubemq-controller +``` + +For a more comprehensive documentation about how to install the KubeMQ Cluster and KubeMQ Connector, check the `kubemq-cluster` and `kubemq-connector` charts documentation out. + +## Upgrading the charts + +Please refer to the release notes of each version of the helm charts. +These can be found [here](https://github.com/kubemq/helm-charts/releases). + +## Uninstalling the charts + +To uninstall/delete kubemq-controller use the following command: + +```console +$ helm uninstall -n kubemq kubemq-controller +``` + +The commands remove all the Kubernetes components associated with the chart. +Keep in mind that the chart is required by the `kubemq-cluster` and `kubemq-connector` charts. + +If you want to keep the history use `--keep-history` flag. diff --git a/charts/kubemq/kubemq-controller/app-readme.md b/charts/kubemq/kubemq-controller/app-readme.md new file mode 100644 index 000000000..aafd3b6e3 --- /dev/null +++ b/charts/kubemq/kubemq-controller/app-readme.md @@ -0,0 +1,33 @@ +# kubemq-controller + +`kubemq-controller` is the Helm chart that installs the KubeMQ Operator and +required by the KubeMQ stack. It should be installed before installing +`kubemq-cluster` and `kubemq-connector` charts. + +## Installing + +For example: +```console +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +$ helm install -n kubemq kubemq-controller kubemq-charts/kubemq-controller +``` + +For a more comprehensive documentation about how to install the KubeMQ Cluster and KubeMQ Connector, check the `kubemq-cluster` and `kubemq-connector` charts documentation out. + +## Upgrading the charts + +Please refer to the release notes of each version of the helm charts. +These can be found [here](https://github.com/kubemq/helm-charts/releases). + +## Uninstalling the charts + +To uninstall/delete kubemq-controller use the following command: + +```console +$ helm uninstall -n kubemq kubemq-controller +``` + +The commands remove all the Kubernetes components associated with the chart. +Keep in mind that the chart is required by the `kubemq-cluster` and `kubemq-connector` charts. + +If you want to keep the history use `--keep-history` flag. diff --git a/charts/kubemq/kubemq-controller/templates/_helpers.tpl b/charts/kubemq/kubemq-controller/templates/_helpers.tpl new file mode 100644 index 000000000..e1d2688d0 --- /dev/null +++ b/charts/kubemq/kubemq-controller/templates/_helpers.tpl @@ -0,0 +1,50 @@ +{{/* vim: set filetype=mustache: */}} + + +{{/*{{- define "kubemq.name" -}}*/}} +{{/*{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}*/}} +{{/*{{- end -}}*/}} + +{{- define "kubemq.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "kubemq.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Generate chart secret name +*/}} +{{- define "kubemq.secretName" -}} +{{ default (include "kubemq.fullname" .) .Values.existingSecret }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "mychart.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "mychart.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{- define "kubemq.crbName" -}} +{{- printf "kubemq-operator-%s-crb" .Release.Namespace -}} +{{- end -}} diff --git a/charts/kubemq/kubemq-controller/templates/operator.yaml b/charts/kubemq/kubemq-controller/templates/operator.yaml new file mode 100644 index 000000000..69ba1181b --- /dev/null +++ b/charts/kubemq/kubemq-controller/templates/operator.yaml @@ -0,0 +1,44 @@ +{{- if not (lookup "apps/v1" "Deployment" .Release.Namespace "kubemq-operator") }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: kubemq-operator + namespace: {{ .Release.Namespace }} +spec: + replicas: 1 + selector: + matchLabels: + app: kubemq-operator + template: + metadata: + labels: + app: kubemq-operator + spec: + serviceAccountName: kubemq-operator + containers: + - name: kubemq-operator + image: docker.io/kubemq/kubemq-operator:latest + command: + - kubemq-operator + imagePullPolicy: Always + ports: + - containerPort: 8080 + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: RELATED_IMAGE_KUBEMQ_CLUSTER + value: "docker.io/kubemq/kubemq:latest" + - name: CONNECTOR_TARGETS_IMAGE + value: "kubemq/kubemq-targets:latest" + - name: CONNECTOR_SOURCES_IMAGE + value: "kubemq/kubemq-sources:latest" + - name: CONNECTOR_BRIDGES_IMAGE + value: "kubemq/kubemq-bridges:latest" + +{{- end }} diff --git a/charts/kubemq/kubemq-controller/templates/role_binding.yaml b/charts/kubemq/kubemq-controller/templates/role_binding.yaml new file mode 100644 index 000000000..5ecb62db6 --- /dev/null +++ b/charts/kubemq/kubemq-controller/templates/role_binding.yaml @@ -0,0 +1,37 @@ +{{- if not (lookup "rbac.authorization.k8s.io/v1" "ClusterRoleBinding" .Release.Namespace (printf "kubemq-operator-%s-crb" .Release.Namespace)) }} +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kubemq-operator-{{ .Release.Namespace }}-crb +subjects: + - kind: ServiceAccount + name: kubemq-operator + namespace: {{ .Release.Namespace }} +roleRef: + kind: ClusterRole + name: kubemq-operator + apiGroup: rbac.authorization.k8s.io +{{- end }} +--- +{{- if not (lookup "rbac.authorization.k8s.io/v1" "Role" .Release.Namespace "kubemq-cluster-role") }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: kubemq-cluster-role + namespace: {{ .Release.Namespace }} +rules: + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + verbs: + - use + - delete + - get + - list + - patch + - update + - watch + resourceNames: + - privileged +{{- end }} diff --git a/charts/kubemq/kubemq-controller/templates/service_account.yaml b/charts/kubemq/kubemq-controller/templates/service_account.yaml new file mode 100644 index 000000000..287c4277a --- /dev/null +++ b/charts/kubemq/kubemq-controller/templates/service_account.yaml @@ -0,0 +1,7 @@ +{{- if not (lookup "v1" "ServiceAccount" .Release.Namespace "kubemq-operator") }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kubemq-operator + namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/charts/kubemq/kubemq-controller/values.yaml b/charts/kubemq/kubemq-controller/values.yaml new file mode 100644 index 000000000..e69de29bb diff --git a/charts/kubemq/kubemq-crds/.helmignore b/charts/kubemq/kubemq-crds/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/charts/kubemq/kubemq-crds/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/kubemq/kubemq-crds/Chart.yaml b/charts/kubemq/kubemq-crds/Chart.yaml new file mode 100644 index 000000000..c5a548615 --- /dev/null +++ b/charts/kubemq/kubemq-crds/Chart.yaml @@ -0,0 +1,16 @@ +annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ CRDs + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-crds +apiVersion: v2 +appVersion: 2.3.7 +description: A Helm chart for KubeMQ CRD +icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg +maintainers: +- email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io +name: kubemq-crds +type: application +version: 2.3.7 diff --git a/charts/kubemq/kubemq-crds/README.md b/charts/kubemq/kubemq-crds/README.md new file mode 100644 index 000000000..b04ff944b --- /dev/null +++ b/charts/kubemq/kubemq-crds/README.md @@ -0,0 +1,34 @@ +# kubemq-crds + +`kubemq-crds` is the Helm chart that installs the Custom Resources Definition +required by the KubeMQ stack. It should be installed before installing +`kubemq-controller`, `kubemq-cluster` and `kubemq-connector` charts. + +## Installing + +For example: +```console +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +$ helm install --create-namespace -n kubemq kubemq-crds kubemq-charts/kubemq-crds +``` + +For a more comprehensive documentation about how to install the whole KubeMQ +stack, check the `kubemq-controller` ,`kubemq-cluster` and `kubemq-connector` charts documentation out. + +## Upgrading the charts + +Please refer to the release notes of each version of the helm charts. +These can be found [here](https://github.com/kubemq/helm-charts/releases). + +## Uninstalling the charts + +To uninstall/delete kubemq-crds use the following command: + +```console +$ helm uninstall -n kubemq kubemq-crds +``` + +The commands remove all the Kubernetes components associated with the chart. +Keep in mind that the chart is required by the `kubemq-controller`, `kubemq-cluster` and `kubemq-connector` charts. + +If you want to keep the history use `--keep-history` flag. diff --git a/charts/kubemq/kubemq-crds/app-readme.md b/charts/kubemq/kubemq-crds/app-readme.md new file mode 100644 index 000000000..b04ff944b --- /dev/null +++ b/charts/kubemq/kubemq-crds/app-readme.md @@ -0,0 +1,34 @@ +# kubemq-crds + +`kubemq-crds` is the Helm chart that installs the Custom Resources Definition +required by the KubeMQ stack. It should be installed before installing +`kubemq-controller`, `kubemq-cluster` and `kubemq-connector` charts. + +## Installing + +For example: +```console +$ helm repo add kubemq-charts https://kubemq-io.github.io/charts +$ helm install --create-namespace -n kubemq kubemq-crds kubemq-charts/kubemq-crds +``` + +For a more comprehensive documentation about how to install the whole KubeMQ +stack, check the `kubemq-controller` ,`kubemq-cluster` and `kubemq-connector` charts documentation out. + +## Upgrading the charts + +Please refer to the release notes of each version of the helm charts. +These can be found [here](https://github.com/kubemq/helm-charts/releases). + +## Uninstalling the charts + +To uninstall/delete kubemq-crds use the following command: + +```console +$ helm uninstall -n kubemq kubemq-crds +``` + +The commands remove all the Kubernetes components associated with the chart. +Keep in mind that the chart is required by the `kubemq-controller`, `kubemq-cluster` and `kubemq-connector` charts. + +If you want to keep the history use `--keep-history` flag. diff --git a/charts/kubemq/kubemq-crds/templates/kubemqclusters.core.k8s.kubemq.io.crd.yaml b/charts/kubemq/kubemq-crds/templates/kubemqclusters.core.k8s.kubemq.io.crd.yaml new file mode 100644 index 000000000..f2774090c --- /dev/null +++ b/charts/kubemq/kubemq-crds/templates/kubemqclusters.core.k8s.kubemq.io.crd.yaml @@ -0,0 +1,357 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: kubemqclusters.core.k8s.kubemq.io +spec: + group: core.k8s.kubemq.io + names: + kind: KubemqCluster + listKind: KubemqClusterList + plural: kubemqclusters + singular: kubemqcluster + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + subresources: + scale: + labelSelectorPath: .status.selector + specReplicasPath: .spec.replicas + statusReplicasPath: .status.replicas + status: { } + schema: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: KubemqClusterSpec defines the desired state of KubemqCluster + properties: + api: + properties: + disabled: + type: boolean + expose: + pattern: (ClusterIP|NodePort|LoadBalancer) + type: string + nodePort: + format: int32 + type: integer + port: + format: int32 + type: integer + type: object + authentication: + properties: + key: + type: string + type: + type: string + type: object + authorization: + properties: + autoReload: + format: int32 + type: integer + policy: + type: string + url: + type: string + type: object + configData: + type: string + grpc: + properties: + bodyLimit: + format: int32 + type: integer + bufferSize: + format: int32 + type: integer + disabled: + type: boolean + expose: + pattern: (ClusterIP|NodePort|LoadBalancer) + type: string + nodePort: + format: int32 + type: integer + port: + format: int32 + type: integer + type: object + health: + properties: + enabled: + type: boolean + failureThreshold: + format: int32 + type: integer + initialDelaySeconds: + format: int32 + type: integer + periodSeconds: + format: int32 + type: integer + successThreshold: + format: int32 + type: integer + timeoutSeconds: + format: int32 + type: integer + type: object + image: + properties: + image: + type: string + pullPolicy: + pattern: (IfNotPresent|Always|Never) + type: string + type: object + license: + type: string + key: + type: string + statefulsetConfigData: + type: string + standalone: + type: boolean + log: + properties: + file: + type: string + level: + format: int32 + type: integer + type: object + nodeSelectors: + properties: + keys: + additionalProperties: + type: string + type: object + type: object + notification: + properties: + enabled: + type: boolean + log: + type: boolean + prefix: + type: string + type: object + queue: + properties: + defaultVisibilitySeconds: + format: int32 + minimum: 0 + type: integer + defaultWaitTimeoutSeconds: + format: int32 + minimum: 0 + type: integer + maxDelaySeconds: + format: int32 + minimum: 0 + type: integer + maxExpirationSeconds: + format: int32 + minimum: 0 + type: integer + maxReQueues: + format: int32 + minimum: 0 + type: integer + maxReceiveMessagesRequest: + format: int32 + minimum: 0 + type: integer + maxVisibilitySeconds: + format: int32 + minimum: 0 + type: integer + maxWaitTimeoutSeconds: + format: int32 + minimum: 0 + type: integer + type: object + replicas: + format: int32 + minimum: 0 + type: integer + resources: + properties: + limitsCpu: + type: string + limitsMemory: + type: string + limitsEphemeralStorage: + type: string + requestsCpu: + type: string + requestsMemory: + type: string + requestsEphemeralStorage: + type: string + type: object + rest: + properties: + bodyLimit: + format: int32 + type: integer + bufferSize: + format: int32 + type: integer + disabled: + type: boolean + expose: + pattern: (ClusterIP|NodePort|LoadBalancer) + type: string + nodePort: + format: int32 + type: integer + port: + format: int32 + type: integer + type: object + routing: + properties: + autoReload: + format: int32 + type: integer + data: + type: string + url: + type: string + type: object + store: + properties: + clean: + type: boolean + maxChannelSize: + format: int32 + minimum: 0 + type: integer + maxChannels: + format: int32 + minimum: 0 + type: integer + maxMessages: + format: int32 + minimum: 0 + type: integer + maxSubscribers: + format: int32 + minimum: 0 + type: integer + messagesRetentionMinutes: + format: int32 + minimum: 0 + type: integer + path: + type: string + purgeInactiveMinutes: + format: int32 + minimum: 0 + type: integer + type: object + tls: + properties: + ca: + type: string + cert: + type: string + key: + type: string + type: object + volume: + properties: + size: + type: string + storageClass: + type: string + type: object + type: object + status: + description: KubemqClusterStatus defines the observed state of KubemqCluster + properties: + api: + type: string + grpc: + type: string + license_expire: + type: string + license_to: + type: string + license_type: + type: string + ready: + format: int32 + type: integer + replicas: + format: int32 + type: integer + rest: + type: string + selector: + type: string + status: + type: string + version: + type: string + required: + - api + - grpc + - license_expire + - license_to + - license_type + - ready + - replicas + - rest + - selector + - status + - version + type: object + type: object + additionalPrinterColumns: + - jsonPath: .status.version + name: Version + type: string + - jsonPath: .status.status + name: Status + type: string + - jsonPath: .status.replicas + name: Replicas + type: string + - jsonPath: .status.ready + name: Ready + type: string + - jsonPath: .status.grpc + name: gRPC + type: string + - jsonPath: .status.rest + name: Rest + type: string + - jsonPath: .status.api + name: API + type: string + - jsonPath: .status.license_type + name: License-type + type: string + - jsonPath: .status.license_to + name: License-To + type: string + - jsonPath: .status.license_expire + name: License-Expire + type: string diff --git a/charts/kubemq/kubemq-crds/templates/kubemqconnectors.core.k8s.kubemq.io.crd.yaml b/charts/kubemq/kubemq-crds/templates/kubemqconnectors.core.k8s.kubemq.io.crd.yaml new file mode 100644 index 000000000..bb88c5451 --- /dev/null +++ b/charts/kubemq/kubemq-crds/templates/kubemqconnectors.core.k8s.kubemq.io.crd.yaml @@ -0,0 +1,98 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: kubemqconnectors.core.k8s.kubemq.io +spec: + group: core.k8s.kubemq.io + names: + kind: KubemqConnector + listKind: KubemqConnectorList + plural: kubemqconnectors + singular: kubemqconnector + scope: Namespaced + versions: + - name: v1beta1 + served: true + storage: true + subresources: + scale: + labelSelectorPath: .status.selector + specReplicasPath: .spec.replicas + statusReplicasPath: .status.replicas + status: { } + additionalPrinterColumns: + - jsonPath: .status.type + name: Type + type: string + - jsonPath: .status.replicas + name: Replicas + type: string + - jsonPath: .status.image + name: Image + type: string + - jsonPath: .status.api + name: API + type: string + - jsonPath: .status.status + name: Status + type: string + schema: + openAPIV3Schema: + description: KubemqConnector is the Schema for the kubemqconnectors API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: KubemqConnectorSpec defines the desired state of KubemqConnector + properties: + config: + type: string + image: + type: string + node_port: + format: int32 + type: integer + replicas: + format: int32 + minimum: 0 + type: integer + service_type: + type: string + type: + type: string + required: + - config + - type + type: object + status: + description: KubemqConnectorStatus defines the observed state of KubemqConnector + properties: + api: + type: string + image: + type: string + replicas: + format: int32 + type: integer + status: + type: string + type: + type: string + required: + - api + - image + - replicas + - status + - type + type: object + type: object diff --git a/charts/kubemq/kubemq-crds/templates/role.yaml b/charts/kubemq/kubemq-crds/templates/role.yaml new file mode 100644 index 000000000..d0a5a7320 --- /dev/null +++ b/charts/kubemq/kubemq-crds/templates/role.yaml @@ -0,0 +1,66 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: kubemq-operator +rules: + - apiGroups: + - "" + resources: + - pods + - services + - endpoints + - persistentvolumeclaims + - events + - configmaps + - serviceaccounts + - secrets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - patch + - update + - create + - get + - apiGroups: + - apps + resources: + - deployments + - replicasets + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create + - apiGroups: + - core.k8s.kubemq.io + resources: + - "*" + verbs: + - create + - delete + - get + - list + - patch + - update + - watch diff --git a/charts/new-relic/nri-bundle/Chart.lock b/charts/new-relic/nri-bundle/Chart.lock index 8ad8a4031..426d58790 100644 --- a/charts/new-relic/nri-bundle/Chart.lock +++ b/charts/new-relic/nri-bundle/Chart.lock @@ -1,36 +1,36 @@ dependencies: - name: newrelic-infrastructure repository: https://newrelic.github.io/nri-kubernetes - version: 3.12.0 + version: 3.14.0 - name: nri-prometheus repository: https://newrelic.github.io/nri-prometheus - version: 2.1.15 + version: 2.1.16 - name: newrelic-prometheus-agent repository: https://newrelic.github.io/newrelic-prometheus-configurator - version: 1.0.1 + version: 1.1.1 - name: nri-metadata-injection repository: https://newrelic.github.io/k8s-metadata-injection - version: 4.0.0 + version: 4.2.1 - name: newrelic-k8s-metrics-adapter repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter - version: 1.0.0 + version: 1.1.2 - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts version: 4.23.0 - name: nri-kube-events repository: https://newrelic.github.io/nri-kube-events - version: 2.3.1 + version: 2.3.3 - name: newrelic-logging repository: https://newrelic.github.io/helm-charts - version: 1.12.3 + version: 1.13.1 - name: newrelic-pixie repository: https://newrelic.github.io/helm-charts - version: 2.0.2 + version: 2.0.6 - name: pixie-operator-chart repository: https://pixie-operator-charts.storage.googleapis.com - version: 0.0.35 + version: 0.0.38 - name: newrelic-infra-operator repository: https://newrelic.github.io/newrelic-infra-operator - version: 2.0.0 -digest: sha256:bef301b9b23e6f66db3547f42155116068219c9a274bc6cbef03a732a17d0cdf -generated: "2023-01-19T18:36:55.128459929Z" + version: 2.1.1 +digest: sha256:efed6618650c409840337c91d19af667027cb6d0d1e3e7cb080fe59b8fc66aac +generated: "2023-03-22T00:59:38.741044745Z" diff --git a/charts/new-relic/nri-bundle/Chart.yaml b/charts/new-relic/nri-bundle/Chart.yaml index 623e8a2cb..aca8c30eb 100644 --- a/charts/new-relic/nri-bundle/Chart.yaml +++ b/charts/new-relic/nri-bundle/Chart.yaml @@ -7,23 +7,23 @@ dependencies: - condition: infrastructure.enabled,newrelic-infrastructure.enabled name: newrelic-infrastructure repository: file://./charts/newrelic-infrastructure - version: 3.12.0 + version: 3.14.0 - condition: prometheus.enabled,nri-prometheus.enabled name: nri-prometheus repository: file://./charts/nri-prometheus - version: 2.1.15 + version: 2.1.16 - condition: newrelic-prometheus-agent.enabled name: newrelic-prometheus-agent repository: file://./charts/newrelic-prometheus-agent - version: 1.0.1 + version: 1.1.1 - condition: webhook.enabled,nri-metadata-injection.enabled name: nri-metadata-injection repository: file://./charts/nri-metadata-injection - version: 4.0.0 + version: 4.2.1 - condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled name: newrelic-k8s-metrics-adapter repository: file://./charts/newrelic-k8s-metrics-adapter - version: 1.0.0 + version: 1.1.2 - condition: ksm.enabled,kube-state-metrics.enabled name: kube-state-metrics repository: file://./charts/kube-state-metrics @@ -31,24 +31,24 @@ dependencies: - condition: kubeEvents.enabled,nri-kube-events.enabled name: nri-kube-events repository: file://./charts/nri-kube-events - version: 2.3.1 + version: 2.3.3 - condition: logging.enabled,newrelic-logging.enabled name: newrelic-logging repository: file://./charts/newrelic-logging - version: 1.12.3 + version: 1.13.1 - condition: newrelic-pixie.enabled name: newrelic-pixie repository: file://./charts/newrelic-pixie - version: 2.0.2 + version: 2.0.6 - alias: pixie-chart condition: pixie-chart.enabled name: pixie-operator-chart repository: file://./charts/pixie-operator-chart - version: 0.0.35 + version: 0.0.38 - condition: newrelic-infra-operator.enabled name: newrelic-infra-operator repository: file://./charts/newrelic-infra-operator - version: 2.0.0 + version: 2.1.1 description: Groups together the individual charts for the New Relic Kubernetes solution for a more comfortable deployment. home: https://github.com/newrelic/helm-charts @@ -58,22 +58,24 @@ keywords: - newrelic - monitoring maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: nri-bundle sources: - https://github.com/newrelic/nri-bundle/ @@ -87,4 +89,4 @@ sources: - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator -version: 5.0.4 +version: 5.0.6 diff --git a/charts/new-relic/nri-bundle/README.md b/charts/new-relic/nri-bundle/README.md index 0776eb80d..be1183677 100644 --- a/charts/new-relic/nri-bundle/README.md +++ b/charts/new-relic/nri-bundle/README.md @@ -16,7 +16,7 @@ here is a list of components that this chart installs and where you can find mor |------------------------------|-----------------------|-------------| | [newrelic-infrastructure](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure) | Yes | Sends metrics about nodes, cluster objects (e.g. Deployments, Pods), and the control plane to New Relic. | | [nri-metadata-injection](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection) | Yes | Enriches New Relic-instrumented applications (APM) with Kubernetes information. | -| [kube-state-metrics](https://github.com/kubernetes/kube-state-metrics/tree/master/charts/kube-state-metrics) | | Required for `newrelic-infrastructure` to gather cluster-level metrics. | +| [kube-state-metrics](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) | | Required for `newrelic-infrastructure` to gather cluster-level metrics. | | [nri-kube-events](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events) | | Reports Kubernetes events to New Relic. | | [newrelic-infra-operator](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) | | (Beta) Used with Fargate or serverless environments to inject `newrelic-infrastructure` as a sidecar instead of the usual DaemonSet. | | [newrelic-k8s-metrics-adapter](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) | | (Beta) Provides a source of data for Horizontal Pod Autoscalers (HPA) based on a NRQL query from New Relic. | @@ -192,11 +192,12 @@ honors global options as described below. ## Maintainers -* [alvarocabanas](https://github.com/alvarocabanas) -* [carlossscastro](https://github.com/carlossscastro) -* [sigilioso](https://github.com/sigilioso) -* [gsanchezgavier](https://github.com/gsanchezgavier) -* [kang-makes](https://github.com/kang-makes) -* [marcsanmi](https://github.com/marcsanmi) -* [paologallinaharbur](https://github.com/paologallinaharbur) -* [roobre](https://github.com/roobre) +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.lock b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.lock index 5c76d8581..4ba89500a 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T12:01:15.642341434Z" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-22T00:04:09.514396222Z" diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.yaml index 7581c44a0..b2f3606de 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 0.8.0 +appVersion: 0.9.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic Infrastructure Kubernetes Operator. home: https://hub.docker.com/r/newrelic/newrelic-infra-operator icon: https://newrelic.com/themes/custom/curio/assets/mediakit/new_relic_logo_vertical.svg @@ -32,4 +32,4 @@ name: newrelic-infra-operator sources: - https://github.com/newrelic/newrelic-infra-operator - https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator -version: 2.0.0 +version: 2.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml index bb0d09ab5..045665511 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: create - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }} imagePullPolicy: {{ .Values.admissionWebhooksPatchJob.image.pullPolicy }} args: - create diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml index f49c4c7ce..e6acc6b90 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: patch - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }} imagePullPolicy: {{ .Values.admissionWebhooksPatchJob.image.pullPolicy }} args: - patch diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/values.yaml index 70f3d4c8f..37f715994 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/values.yaml @@ -26,7 +26,7 @@ image: # @default -- See `values.yaml` admissionWebhooksPatchJob: image: - registry: # Defaults to k8s.gcr.io + registry: # Defaults to registry.k8s.io repository: ingress-nginx/kube-webhook-certgen tag: v1.3.0 pullPolicy: IfNotPresent diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.lock b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.lock index 158fde758..baf795d4a 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T13:16:31.608584+02:00" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-15T19:27:04.098609519Z" diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml index 573c272fb..76e44c1ad 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.6.0 +appVersion: 3.9.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic Kubernetes monitoring solution home: https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/introduction-kubernetes-integration/ icon: https://newrelic.com/themes/custom/curio/assets/mediakit/NR_logo_Horizontal.svg @@ -12,25 +12,27 @@ keywords: - newrelic - monitoring maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: newrelic-infrastructure sources: - https://github.com/newrelic/nri-kubernetes/ - https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure - https://github.com/newrelic/infrastructure-agent/ -version: 3.12.0 +version: 3.14.0 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/README.md b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/README.md index 455739f00..61a8c0c93 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/README.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/README.md @@ -153,19 +153,20 @@ integrations that you have configured. | ksm.config.selector | string | `"app.kubernetes.io/name=kube-state-metrics"` | Label selector that will be used to automatically discover an instance of kube-state-metrics running in the cluster. | | ksm.config.timeout | string | `"10s"` | Timeout for the ksm API contacted by the integration | | ksm.enabled | bool | `true` | Enable cluster state monitoring. Advanced users only. Setting this to `false` is not supported and will break the New Relic experience. | -| ksm.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable | +| ksm.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable | | ksm.resources | object | 100m/150M -/850M | Resources for the KSM scraper pod. Keep in mind that sharding is not supported at the moment, so memory usage for this component ramps up quickly on large clusters. | | ksm.tolerations | list | Schedules in all tainted nodes | Tolerations for the KSM Deployment. | | kubelet | object | See `values.yaml` | Configuration for the DaemonSet that collects metrics from the Kubelet. | | kubelet.agentConfig | object | `{}` | Config for the Infrastructure agent that will forward the metrics to the backend and will run the integrations in this cluster. It will be merged with the configuration in `.common.agentConfig`. You can see all the agent configurations in [New Relic docs](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/) e.g. you can set `passthrough_environment` int the [config file](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/configure-infrastructure-agent/#config-file) so the agent let use that environment variables to the integrations. | | kubelet.config.retries | int | `3` | Number of retries after timeout expired | +| kubelet.config.scraperMaxReruns | int | `4` | Max number of scraper rerun when scraper runtime error happens | | kubelet.config.timeout | string | `"10s"` | Timeout for the kubelet APIs contacted by the integration | | kubelet.enabled | bool | `true` | Enable kubelet monitoring. Advanced users only. Setting this to `false` is not supported and will break the New Relic experience. | | kubelet.extraEnv | list | `[]` | Add user environment variables to the agent | | kubelet.extraEnvFrom | list | `[]` | Add user environment from configMaps or secrets as variables to the agent | | kubelet.extraVolumeMounts | list | `[]` | Defines where to mount volumes specified with `extraVolumes` | | kubelet.extraVolumes | list | `[]` | Volumes to mount in the containers | -| kubelet.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable | +| kubelet.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable | | kubelet.tolerations | list | Schedules in all tainted nodes | Tolerations for the control plane DaemonSet. | | labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` | | licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` | @@ -191,14 +192,15 @@ integrations that you have configured. ## Maintainers -* [alvarocabanas](https://github.com/alvarocabanas) -* [carlossscastro](https://github.com/carlossscastro) -* [sigilioso](https://github.com/sigilioso) -* [gsanchezgavier](https://github.com/gsanchezgavier) -* [kang-makes](https://github.com/kang-makes) -* [marcsanmi](https://github.com/marcsanmi) -* [paologallinaharbur](https://github.com/paologallinaharbur) -* [roobre](https://github.com/roobre) +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) ## Past Contributors diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/values.yaml index 4a240a52d..a08079f4d 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/values.yaml @@ -23,14 +23,14 @@ images: forwarder: registry: "" repository: newrelic/k8s-events-forwarder - tag: 1.36.1 + tag: 1.39.1 pullPolicy: IfNotPresent # -- Image for the New Relic Infrastructure Agent plus integrations. # @default -- See `values.yaml` agent: registry: "" repository: newrelic/infrastructure-bundle - tag: 2.8.38 + tag: 3.1.4 pullPolicy: IfNotPresent # -- Image for the New Relic Kubernetes integration. # @default -- See `values.yaml` @@ -57,7 +57,7 @@ common: # Otherwise you can build more complex filters and include or exclude certain namespaces by adding one or multiple # expressions that are added, for instance: # matchExpressions: - # - {key: newrelic.com/scrape, operator: NotIn, values: [false]} + # - {key: newrelic.com/scrape, operator: NotIn, values: ["false"]} # -- Config for the Infrastructure agent. # Will be used by the forwarder sidecars and the agent running integrations. @@ -118,6 +118,8 @@ kubelet: timeout: 10s # -- Number of retries after timeout expired retries: 3 + # -- Max number of scraper rerun when scraper runtime error happens + scraperMaxReruns: 4 # port: # scheme: diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.lock b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.lock index da5ea35ba..a2f8a4d29 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T14:44:15.768825122Z" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-22T00:07:39.997727169Z" diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.yaml index 100b16283..926ec15a0 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 0.2.0 +appVersion: 0.3.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic Kubernetes Metrics Adapter. home: https://hub.docker.com/r/newrelic/newrelic-k8s-metrics-adapter icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg @@ -12,16 +12,26 @@ keywords: - newrelic - monitoring maintainers: -- name: alvarocabanas -- name: carlossscastro -- name: gsanchezgavier -- name: kang-makes -- name: marcsanmi -- name: paologallinaharbur -- name: roobre -- name: sigilioso +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: newrelic-k8s-metrics-adapter sources: - https://github.com/newrelic/newrelic-k8s-metrics-adapter - https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter -version: 1.0.0 +version: 1.1.2 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/README.md b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/README.md index 7aa295101..afda8a867 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/README.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/README.md @@ -15,7 +15,7 @@ A Helm chart to deploy the New Relic Kubernetes Metrics Adapter. | Repository | Name | Version | |------------|------|---------| -| https://helm-charts.newrelic.com | common-library | 1.1.0 | +| https://helm-charts.newrelic.com | common-library | 1.1.1 | ## Values @@ -133,11 +133,12 @@ resources: ## Maintainers -* alvarocabanas -* carlossscastro -* gsanchezgavier -* kang-makes -* marcsanmi -* paologallinaharbur -* roobre -* sigilioso +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml index 1ada67924..51b30809d 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml @@ -22,7 +22,7 @@ spec: {{- end }} containers: - name: create - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }} imagePullPolicy: {{ .Values.apiServicePatchJob.image.pullPolicy }} args: - create diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml index c2e368449..ed44a70ae 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml @@ -22,7 +22,7 @@ spec: {{- end }} containers: - name: patch - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }} imagePullPolicy: {{ .Values.apiServicePatchJob.image.pullPolicy }} args: - patch diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml index 78c25b15b..a9fb6d6ed 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml @@ -23,9 +23,9 @@ tests: personalAPIKey: 21321 apiServicePatchJob: image: - repository: k8s.gcr.io/ingress-nginx/kube-webhook-certgen + repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen tag: "latest" asserts: - matchRegex: path: spec.template.spec.containers[0].image - pattern: ^.*k8s.gcr.io/ingress-nginx/kube-webhook-certgen:latest + pattern: ^.*registry.k8s.io/ingress-nginx/kube-webhook-certgen:latest diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml index 9fffe715e..602d1b88b 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml @@ -26,9 +26,9 @@ tests: personalAPIKey: 21321 apiServicePatchJob: image: - repository: k8s.gcr.io/ingress-nginx/kube-webhook-certgen + repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen tag: "latest" asserts: - matchRegex: path: spec.template.spec.containers[0].image - pattern: .*k8s.gcr.io/ingress-nginx/kube-webhook-certgen:latest$ + pattern: .*registry.k8s.io/ingress-nginx/kube-webhook-certgen:latest$ diff --git a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/values.yaml index 494c8a2ce..32ac5b1a2 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-k8s-metrics-adapter/values.yaml @@ -127,7 +127,7 @@ apiServicePatchJob: # apiServicePatchJob.image -- Registry, repository, tag, and pull policy for the job container image. # @default -- See `values.yaml`. image: - registry: # defaults to k8s.gcr.io + registry: # defaults to registry.k8s.io repository: ingress-nginx/kube-webhook-certgen tag: v1.3.0 pullPolicy: IfNotPresent diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.lock b/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.lock index 64b6f7c1d..339365e43 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T11:59:07.989469945Z" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-21T22:34:27.606266389Z" diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.yaml index 625fdb5cd..50f159704 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 1.14.0 +appVersion: 1.14.2 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers home: https://github.com/newrelic/kubernetes-logging @@ -17,4 +17,4 @@ maintainers: - name: danybmx - name: sdaubin name: newrelic-logging -version: 1.12.3 +version: 1.13.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/README.md b/charts/new-relic/nri-bundle/charts/newrelic-logging/README.md index 571abae3b..70cc19e4d 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/README.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/README.md @@ -210,6 +210,7 @@ This Helm chart deploys one `DaemonSet` for each of the Windows versions it supp This Helm chart currently supports the following Windows versions: - Windows Server LTSC 2019, build 10.0.17763 +- Windows Server LTSC 2022, build 10.0.20348 ## Troubleshooting diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-logging/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/templates/daemonset-windows.yaml b/charts/new-relic/nri-bundle/charts/newrelic-logging/templates/daemonset-windows.yaml index 6884f59aa..bc5ca0baf 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/templates/daemonset-windows.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/templates/daemonset-windows.yaml @@ -142,6 +142,6 @@ spec: tolerations: {{ toYaml $.Values.tolerations | indent 8 }} {{- end }} -{{- end }} --- {{- end }} +{{- end }} diff --git a/charts/new-relic/nri-bundle/charts/newrelic-logging/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-logging/values.yaml index 57ec1f669..408c9172f 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-logging/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-logging/values.yaml @@ -169,13 +169,14 @@ enableWindows: false # Windows containers can only be executed on hosts running the exact same Windows version and build number, # because Kubernetes only supports process isolation and not Hyper-V isolation (as of September 2021) windowsOsList: - # Right now, the windows-2019 worker offerred by GitHub is based on ltsc2019/10.0.17763.2183, - # so it can only compile containers running this specific version and compilation number of the OS. - # We aim to support (but right now, we can only support LTSC2019 using GitHub actions): + # We aim to support (limited to LTSC2019/LTSC2022 using GitHub actions, see https://github.com/actions/runner-images/tree/main/images/win): # https://kubernetes.io/docs/setup/production-environment/windows/intro-windows-in-kubernetes/#windows-os-version-support - version: ltsc2019 imageTagSuffix: windows-ltsc-2019 buildNumber: 10.0.17763 + - version: ltsc2022 + imageTagSuffix: windows-ltsc-2022 + buildNumber: 10.0.20348 resources: limits: diff --git a/charts/new-relic/nri-bundle/charts/newrelic-pixie/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-pixie/Chart.yaml index 257ba45a0..c2254fd6e 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-pixie/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-pixie/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2.0.2 +appVersion: 2.0.5 description: A Helm chart for the New Relic Pixie integration. home: https://hub.docker.com/u/newrelic icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg @@ -8,13 +8,16 @@ keywords: - pixie - monitoring maintainers: -- name: alvarocabanas -- name: carlossscastro -- name: gsanchezgavier -- name: kang-makes -- name: paologallinaharbur -- name: roobre +- name: nserrino +- name: philkuz +- name: htroisi +- name: juanjjaramillo +- name: svetlanabrennan +- name: nrepai +- name: csongnr +- name: vuqtran88 +- name: xqi-nr name: newrelic-pixie sources: - https://github.com/newrelic/ -version: 2.0.2 +version: 2.0.6 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/_helpers.tpl b/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/_helpers.tpl index ec11b6cb0..40b9c68df 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/_helpers.tpl +++ b/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/_helpers.tpl @@ -82,16 +82,34 @@ release: {{.Release.Name }} {{- end -}} {{- end -}} -{{/* -Returns lowDataMode -*/}} +{{- /* +adapted from https://github.com/newrelic/helm-charts/blob/af747af93fb5b912374196adc59b552965b6e133/library/common-library/templates/_low-data-mode.tpl +TODO: actually use common-library chart dep +*/ -}} +{{- /* +Abstraction of the lowDataMode toggle. +This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`. +Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string) +*/ -}} {{- define "newrelic-pixie.lowDataMode" -}} -{{- if .Values.global }} - {{- if .Values.global.lowDataMode }} - {{- .Values.global.lowDataMode -}} - {{- end -}} -{{- else if .Values.lowDataMode }} - {{- .Values.lowDataMode -}} +{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}} +{{- if (get .Values "lowDataMode" | kindIs "bool") -}} + {{- if .Values.lowDataMode -}} + {{- /* + We want only to return when this is true, returning `false` here will template "false" (string) when doing + an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used + as an evaluation somewhere else. + */ -}} + {{- .Values.lowDataMode -}} + {{- end -}} +{{- else -}} +{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}} +{{- $global := index .Values "global" | default dict -}} +{{- if get $global "lowDataMode" | kindIs "bool" -}} + {{- if $global.lowDataMode -}} + {{- $global.lowDataMode -}} + {{- end -}} +{{- end -}} {{- end -}} {{- end -}} diff --git a/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/job.yaml b/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/job.yaml index 2d0e48ad5..e37f65f2a 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/job.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-pixie/templates/job.yaml @@ -19,6 +19,22 @@ spec: {{- toYaml .Values.image.pullSecrets | nindent 8 }} {{- end }} restartPolicy: Never + initContainers: + - name: cluster-registration-wait + image: gcr.io/pixie-oss/pixie-dev-public/curl:1.0 + command: ['sh', '-c', 'set -x; + URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "Waiting for cluster registration. If this takes too long check the vizier-cloud-connector logs." + sleep 2; + done; + '] + env: + # The name of the Pixie service which connects to Pixie Cloud for cluster registration. + - name: SERVICE_NAME + value: "vizier-cloud-connector-svc" + - name: SERVICE_PORT + value: "50800" containers: - name: {{ template "newrelic-pixie.name" . }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" @@ -66,6 +82,13 @@ spec: value: "750" - name: DB_SPAN_LIMIT value: "250" + {{- else }} + - name: COLLECT_INTERVAL_SEC + value: "10" + - name: HTTP_SPAN_LIMIT + value: "1500" + - name: DB_SPAN_LIMIT + value: "500" {{- end }} {{- if (include "newrelic-pixie.nrStaging" .) }} - name: NR_OTLP_HOST diff --git a/charts/new-relic/nri-bundle/charts/newrelic-pixie/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-pixie/values.yaml index 57dbf9001..e5f5445c5 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-pixie/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-pixie/values.yaml @@ -54,5 +54,6 @@ excludePodsRegex: # When low data mode is enabled the integration performs heavier sampling on the Pixie span data # and sets the collect interval to 15 seconds instead of 10 seconds. -# Can be set as a global: global.lowDataMode -lowDataMode: false +# Can be set as a global: global.lowDataMode or locally as newrelic-pixie.lowDataMode +# @default -- false +lowDataMode: diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/CHANGELOG.md b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/CHANGELOG.md index 912497c03..1d5fa8bfc 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/CHANGELOG.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/CHANGELOG.md @@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## v1.1.1 - 2023-03-20 + +### ⛓️ Dependencies +- Updated common-library to v1.1.1 - [Changelog 🔗](https://github.com/newrelic/helm-charts/releases/tag/common-library-1.1.1) + +## v1.1.0 - 2023-01-30 + +### 🚀 Enhancements +- Set `NR_PROM_CHART_VERSION` env var in the configurator statefulset init container. + +### ⛓️ Dependencies +- Upgraded github.com/prometheus/prometheus from 0.37.3 to 0.37.5 - [Changelog 🔗](https://github.com/prometheus/prometheus/releases/tag/0.37.5) + ## v1.0.1 - 2022-11-30 ### 🐞 Bug fixes diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.lock b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.lock index 5b28163ad..63a6a1f58 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-12T12:36:37.388558+02:00" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-17T21:52:16.727868721Z" diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.yaml index be30d5dd0..33689d6fa 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/Chart.yaml @@ -1,32 +1,34 @@ annotations: - configuratorVersion: 1.0.0 + configuratorVersion: 1.3.0 apiVersion: v2 -appVersion: v2.37.3 +appVersion: v2.37.5 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy Prometheus with New Relic Prometheus Configurator. keywords: - newrelic - prometheus maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: newrelic-prometheus-agent type: application -version: 1.0.1 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md index 3e39fb8ad..ec13a0b1b 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md @@ -78,7 +78,7 @@ By default, some Kubernetes objects are discovered and scraped by Prometheus. Ta integrations_filter: enabled: true source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"] - app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb"] + app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb", "velero", "harbor", "argocd"] jobs: - job_name_prefix: default target_discovery: @@ -126,7 +126,7 @@ config: - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name] action: keep regex: default;kubernetes - + scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -201,7 +201,7 @@ The order to set the affinity is to set `affinity` field (at root level), if tha | config.extra_remote_write | object | `nil` | It includes additional remote-write configuration. Note this configuration is not parsed, so valid [prometheus remote_write configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) should be provided. | | config.extra_scrape_configs | list | `[]` | It is possible to include extra scrape configuration in [prometheus format](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config). Please note, it should be a valid Prometheus configuration which will not be parsed by the chart. WARNING extra_scrape_configs is a raw Prometheus config. Therefore, the metrics collected thanks to it will not have by default the metadata (pod_name, service_name, ...) added by the configurator for the static or kubernetes jobs. This configuration should be used as a workaround whenever kubernetes and static job do not cover a particular use-case. | | config.kubernetes | object | See `values.yaml` | It allows defining scrape jobs for Kubernetes in a simple way. | -| config.kubernetes.integrations_filter.app_values | list | `["redis","traefik","calico","nginx","coredns","kube-dns","etcd","cockroachdb"]` | app_values used to create the regex used in the relabel config added by the integration filters configuration. Note that a single regex will be created from this list, example: '.*(?i)(app1|app2|app3).*' | +| config.kubernetes.integrations_filter.app_values | list | `["redis","traefik","calico","nginx","coredns","kube-dns","etcd","cockroachdb","velero","harbor","argocd"]` | app_values used to create the regex used in the relabel config added by the integration filters configuration. Note that a single regex will be created from this list, example: '.*(?i)(app1|app2|app3).*' | | config.kubernetes.integrations_filter.enabled | bool | `true` | enabling the integration filters, merely the targets having one of the specified labels matching one of the values of app_values are scraped. Each job configuration can override this default. | | config.kubernetes.integrations_filter.source_labels | list | `["app.kubernetes.io/name","app.newrelic.io/name","k8s-app"]` | source_labels used to fetch label values in the relabel config added by the integration filters configuration | | config.newrelic_remote_write | object | See `values.yaml` | Newrelic remote-write configuration settings. | @@ -241,11 +241,12 @@ The order to set the affinity is to set `affinity` field (at root level), if tha ## Maintainers -* [alvarocabanas](https://github.com/alvarocabanas) -* [carlossscastro](https://github.com/carlossscastro) -* [sigilioso](https://github.com/sigilioso) -* [gsanchezgavier](https://github.com/gsanchezgavier) -* [kang-makes](https://github.com/kang-makes) -* [marcsanmi](https://github.com/marcsanmi) -* [paologallinaharbur](https://github.com/paologallinaharbur) -* [roobre](https://github.com/roobre) +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md.gotmpl b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md.gotmpl index 26c3bfeb0..55d91745d 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md.gotmpl +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/README.md.gotmpl @@ -65,7 +65,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera ## Chart particularities -### Configuration +### Configuration The configuration used is similar to the [Prometheus configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/), but it includes some syntactic sugar to make easy to set up some special use-cases like Kubernetes targets, sharding and some New Relic related settings like remote write endpoints. @@ -83,7 +83,7 @@ By default, some Kubernetes objects are discovered and scraped by Prometheus. Ta integrations_filter: enabled: true source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"] - app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb"] + app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb", "velero", "harbor", "argocd"] jobs: - job_name_prefix: default target_discovery: @@ -131,7 +131,7 @@ config: - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name] action: keep regex: default;kubernetes - + scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/release-notes.md b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/release-notes.md index 10ba4e121..c0f50b381 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/release-notes.md +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/release-notes.md @@ -1,2 +1,2 @@ -### 🐞 Bug fixes -- whenever `config.kubernetes.integrations_filter.enabled: false` we should pass the list of `labels` and `app_values` to the configurator config. \ No newline at end of file +### ⛓️ Dependencies +- Updated common-library to v1.1.1 - [Changelog 🔗](https://github.com/newrelic/helm-charts/releases/tag/common-library-1.1.1) diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/templates/statefulset.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/templates/statefulset.yaml index 2dac97be5..193e5ca42 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/templates/statefulset.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/templates/statefulset.yaml @@ -71,6 +71,8 @@ spec: secretKeyRef: name: {{ include "newrelic.common.license.secretName" . }} key: {{ include "newrelic.common.license.secretKeyName" . }} + - name: NR_PROM_CHART_VERSION + value: {{ .Chart.Version }} containers: - name: prometheus diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/configmap_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/configmap_test.yaml index bb854d8d4..08a2b985a 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/configmap_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/configmap_test.yaml @@ -70,6 +70,9 @@ tests: - kube-dns - etcd - cockroachdb + - velero + - harbor + - argocd enabled: true source_labels: - app.kubernetes.io/name @@ -512,6 +515,9 @@ tests: - kube-dns - etcd - cockroachdb + - velero + - harbor + - argocd enabled: false source_labels: - app.kubernetes.io/name diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml index 7efc1349e..ad44c1d1b 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml @@ -51,6 +51,9 @@ tests: - kube-dns - etcd - cockroachdb + - velero + - harbor + - argocd enabled: true source_labels: - app.kubernetes.io/name @@ -106,6 +109,9 @@ tests: - kube-dns - etcd - cockroachdb + - velero + - harbor + - argocd enabled: false source_labels: - app.kubernetes.io/name diff --git a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/values.yaml b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/values.yaml index 140d6d9de..571a5b133 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/values.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-prometheus-agent/values.yaml @@ -139,10 +139,35 @@ config: # -- (object) Newrelic remote-write configuration settings. # @default -- See `values.yaml` newrelic_remote_write: - # -- Includes additional [relabel configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) - # for the New Relic remote write. - # @default -- `[]` - # extra_write_relabel_configs: + # # -- Includes additional [relabel configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) + # # for the New Relic remote write. + # # @default -- `[]` + # extra_write_relabel_configs: [] + + # # Enable the extra_write_relabel_configs below for backwards compatibility with legacy POMI labels. + # # This helpful when migrating from POMI to ensure that Prometheus metrics will contain both labels (e.g. cluster_name and clusterName). + # # For more migration info, please visit the [migration guide](https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-prometheus-agent/migration-guide/). + # - source_labels: [namespace] + # action: replace + # target_label: namespaceName + # - source_labels: [node] + # action: replace + # target_label: nodeName + # - source_labels: [pod] + # action: replace + # target_label: podName + # - source_labels: [service] + # action: replace + # target_label: serviceName + # - source_labels: [cluster_name] + # action: replace + # target_label: clusterName + # - source_labels: [job] + # action: replace + # target_label: scrapedTargetKind + # - source_labels: [instance] + # action: replace + # target_label: scrapedTargetInstance # -- Set up the proxy used to send metrics to New Relic. # @default -- `""` @@ -200,7 +225,7 @@ config: source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"] # -- app_values used to create the regex used in the relabel config added by the integration filters configuration. # Note that a single regex will be created from this list, example: '.*(?i)(app1|app2|app3).*' - app_values: ["redis", "traefik", "calico", "nginx", "coredns", "kube-dns", "etcd", "cockroachdb"] + app_values: ["redis", "traefik", "calico", "nginx", "coredns", "kube-dns", "etcd", "cockroachdb", "velero", "harbor", "argocd"] # Kubernetes jobs define [kubernetes_sd_configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config) # to discover and scrape Kubernetes objects. Besides, a set of relabel_configs are included in order to include some Kubernetes metadata as diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.lock b/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.lock index bb9db1537..ee899c0fb 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-12T16:59:30.970798+02:00" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-14T22:34:43.015395995Z" diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.yaml index 73b46c695..e804ba88c 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 1.9.1 +appVersion: 1.9.2 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic Kube Events router home: https://docs.newrelic.com/docs/integrations/kubernetes-integration/kubernetes-events/install-kubernetes-events-integration icon: https://newrelic.com/themes/custom/curio/assets/mediakit/NR_logo_Horizontal.svg @@ -12,25 +12,27 @@ keywords: - newrelic - monitoring maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: nri-kube-events sources: - https://github.com/newrelic/nri-kube-events/ - https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events - https://github.com/newrelic/infrastructure-agent/ -version: 2.3.1 +version: 2.3.3 diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/README.md b/charts/new-relic/nri-bundle/charts/nri-kube-events/README.md index 8ebb77f3f..cf502e058 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/README.md +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/README.md @@ -1,6 +1,6 @@ # nri-kube-events -![Version: 2.2.6](https://img.shields.io/badge/Version-2.2.6-informational?style=flat-square) ![AppVersion: 1.8.0](https://img.shields.io/badge/AppVersion-1.8.0-informational?style=flat-square) +![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square) A Helm chart to deploy the New Relic Kube Events router @@ -44,6 +44,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera | deployment.annotations | object | `{}` | Annotations to add to the Deployment. | | dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` | | fedramp.enabled | bool | `false` | Enables FedRAMP. Can be configured also with `global.fedramp.enabled` | +| forwarder | object | `{"resources":{}}` | Resources for the forwarder sidecar container | | fullnameOverride | string | `""` | Override the full name of the release | | hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` | | images | object | See `values.yaml` | Images used by the chart for the integration and agents | @@ -61,7 +62,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera | priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` | | proxy | string | `""` | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy` | | rbac.create | bool | `true` | Specifies whether RBAC resources should be created | -| resources | object | `{}` | Resources available for this pod | +| resources | object | `{}` | Resources for the integration container | | serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | | sinks | object | See `values.yaml` | Configure where will the metrics be written. Mostly for debugging purposes. | @@ -72,11 +73,12 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera ## Maintainers -* [alvarocabanas](https://github.com/alvarocabanas) -* [carlossscastro](https://github.com/carlossscastro) -* [sigilioso](https://github.com/sigilioso) -* [gsanchezgavier](https://github.com/gsanchezgavier) -* [kang-makes](https://github.com/kang-makes) -* [marcsanmi](https://github.com/marcsanmi) -* [paologallinaharbur](https://github.com/paologallinaharbur) -* [roobre](https://github.com/roobre) +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-kube-events/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/templates/deployment.yaml b/charts/new-relic/nri-bundle/charts/nri-kube-events/templates/deployment.yaml index 2c9f1d928..3d05ac0a6 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/templates/deployment.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/templates/deployment.yaml @@ -79,6 +79,10 @@ spec: - name: config mountPath: /etc/newrelic-infra.yml subPath: newrelic-infra.yml + {{- if ((.Values.forwarder).resources) }} + resources: + {{- toYaml .Values.forwarder.resources | nindent 12 }} + {{- end }} {{- end }} serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }} volumes: diff --git a/charts/new-relic/nri-bundle/charts/nri-kube-events/values.yaml b/charts/new-relic/nri-bundle/charts/nri-kube-events/values.yaml index 9533d787a..b8a43188d 100644 --- a/charts/new-relic/nri-bundle/charts/nri-kube-events/values.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-kube-events/values.yaml @@ -27,13 +27,13 @@ images: agent: registry: repository: newrelic/k8s-events-forwarder - tag: 1.36.1 + tag: 1.39.1 pullPolicy: IfNotPresent # -- The secrets that are needed to pull images from a custom registry. pullSecrets: [] # - name: regsecret -# -- Resources available for this pod +# -- Resources for the integration container resources: {} # limits: # cpu: 100m @@ -42,6 +42,16 @@ resources: {} # cpu: 100m # memory: 128Mi +# -- Resources for the forwarder sidecar container +forwarder: + resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + rbac: # -- Specifies whether RBAC resources should be created create: true diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.lock b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.lock index 4fa9e609f..546738c19 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T13:47:55.017532364Z" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-21T23:56:18.46795845Z" diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.yaml index 572e08c27..768a7772e 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 1.7.5 +appVersion: 1.9.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic metadata injection webhook. home: https://hub.docker.com/r/newrelic/k8s-metadata-injection icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg @@ -12,24 +12,26 @@ keywords: - newrelic - monitoring maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre -- name: sigilioso - url: https://github.com/sigilioso +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: nri-metadata-injection sources: - https://github.com/newrelic/k8s-metadata-injection - https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection -version: 4.0.0 +version: 4.2.1 diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/README.md b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/README.md index a414cce6e..93d370ab5 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/README.md +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/README.md @@ -61,11 +61,12 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera ## Maintainers -* [alvarocabanas](https://github.com/alvarocabanas) -* [carlossscastro](https://github.com/carlossscastro) -* [gsanchezgavier](https://github.com/gsanchezgavier) -* [kang-makes](https://github.com/kang-makes) -* [marcsanmi](https://github.com/marcsanmi) -* [paologallinaharbur](https://github.com/paologallinaharbur) -* [roobre](https://github.com/roobre) -* [sigilioso](https://github.com/sigilioso) +* [nserrino](https://github.com/nserrino) +* [philkuz](https://github.com/philkuz) +* [htroisi](https://github.com/htroisi) +* [juanjjaramillo](https://github.com/juanjjaramillo) +* [svetlanabrennan](https://github.com/svetlanabrennan) +* [nrepai](https://github.com/nrepai) +* [csongnr](https://github.com/csongnr) +* [vuqtran88](https://github.com/vuqtran88) +* [xqi-nr](https://github.com/xqi-nr) diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml index 869f27fdb..3db03d664 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml @@ -14,6 +14,10 @@ spec: template: metadata: name: {{ include "nri-metadata-injection.fullname.admission-create" . }} + {{- if .Values.podAnnotations }} + annotations: + {{- toYaml .Values.podAnnotations | nindent 8 }} + {{- end }} labels: app: {{ include "nri-metadata-injection.name.admission-create" . }} {{- include "newrelic.common.labels" . | nindent 8 }} @@ -24,7 +28,7 @@ spec: {{- end }} containers: - name: create - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.jobImage "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.jobImage "context" .) }} imagePullPolicy: {{ .Values.jobImage.pullPolicy }} args: - create diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml index 7cec2f828..0dfe4f721 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -14,6 +14,10 @@ spec: template: metadata: name: {{ include "nri-metadata-injection.fullname.admission-patch" . }} + {{- if .Values.podAnnotations }} + annotations: + {{- toYaml .Values.podAnnotations | nindent 8 }} + {{- end }} labels: app: {{ include "nri-metadata-injection.name.admission-patch" . }} {{- include "newrelic.common.labels" . | nindent 8 }} @@ -24,7 +28,7 @@ spec: {{- end }} containers: - name: patch - image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "k8s.gcr.io" "imageRoot" .Values.jobImage "context" .) }} + image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.jobImage "context" .) }} imagePullPolicy: {{ .Values.jobImage.pullPolicy }} args: - patch diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml index a47f48223..dc669be1f 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml @@ -32,6 +32,4 @@ webhooks: failurePolicy: Ignore timeoutSeconds: {{ .Values.timeoutSeconds }} sideEffects: None - admissionReviewVersions: - - v1beta1 - - v1 + admissionReviewVersions: ["v1", "v1beta1"] diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/values.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/values.yaml index 92fd7eeb6..4a124247e 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/values.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/values.yaml @@ -20,7 +20,7 @@ image: # -- Image for creating the needed certificates of this webhook to work # @default -- See `values.yaml` jobImage: - registry: # Defaults to k8s.gcr.io + registry: # Defaults to registry.k8s.io repository: ingress-nginx/kube-webhook-certgen tag: v1.3.0 pullPolicy: IfNotPresent diff --git a/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.lock b/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.lock index 5ba49c404..d3d13d8c7 100644 --- a/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.lock +++ b/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 -digest: sha256:2784850d2fcf8acf99ea543b6ef0b7db24ba0b88f9c0aa83edbada0bebdc4fa8 -generated: "2022-09-07T13:52:15.58563584Z" + version: 1.1.1 +digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162 +generated: "2023-03-15T19:11:26.516216315Z" diff --git a/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.yaml index 152e61558..f44c6d3c1 100644 --- a/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-prometheus/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 2.16.7 +appVersion: 2.18.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com - version: 1.1.0 + version: 1.1.1 description: A Helm chart to deploy the New Relic Prometheus OpenMetrics integration home: https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-openmetrics/configure-prometheus-openmetrics-integrations/ icon: https://newrelic.com/themes/custom/curio/assets/mediakit/new_relic_logo_vertical.svg @@ -32,4 +32,4 @@ name: nri-prometheus sources: - https://github.com/newrelic/nri-prometheus - https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus -version: 2.1.15 +version: 2.1.16 diff --git a/charts/new-relic/nri-bundle/charts/nri-prometheus/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/charts/nri-prometheus/charts/common-library/Chart.yaml index 66fbcc9cf..d01fcb482 100644 --- a/charts/new-relic/nri-bundle/charts/nri-prometheus/charts/common-library/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-prometheus/charts/common-library/Chart.yaml @@ -4,22 +4,24 @@ keywords: - newrelic - chart-library maintainers: -- name: alvarocabanas - url: https://github.com/alvarocabanas -- name: carlossscastro - url: https://github.com/carlossscastro -- name: sigilioso - url: https://github.com/sigilioso -- name: gsanchezgavier - url: https://github.com/gsanchezgavier -- name: kang-makes - url: https://github.com/kang-makes -- name: marcsanmi - url: https://github.com/marcsanmi -- name: paologallinaharbur - url: https://github.com/paologallinaharbur -- name: roobre - url: https://github.com/roobre +- name: nserrino + url: https://github.com/nserrino +- name: philkuz + url: https://github.com/philkuz +- name: htroisi + url: https://github.com/htroisi +- name: juanjjaramillo + url: https://github.com/juanjjaramillo +- name: svetlanabrennan + url: https://github.com/svetlanabrennan +- name: nrepai + url: https://github.com/nrepai +- name: csongnr + url: https://github.com/csongnr +- name: vuqtran88 + url: https://github.com/vuqtran88 +- name: xqi-nr + url: https://github.com/xqi-nr name: common-library type: library -version: 1.1.0 +version: 1.1.1 diff --git a/charts/new-relic/nri-bundle/charts/pixie-operator-chart/Chart.yaml b/charts/new-relic/nri-bundle/charts/pixie-operator-chart/Chart.yaml index fa4c8c7cb..80117a0d3 100644 --- a/charts/new-relic/nri-bundle/charts/pixie-operator-chart/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/pixie-operator-chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: pixie-operator-chart type: application -version: 0.0.35 +version: 0.0.38 diff --git a/charts/new-relic/nri-bundle/charts/pixie-operator-chart/templates/deleter.yaml b/charts/new-relic/nri-bundle/charts/pixie-operator-chart/templates/deleter.yaml index 092f848c4..1d66295af 100644 --- a/charts/new-relic/nri-bundle/charts/pixie-operator-chart/templates/deleter.yaml +++ b/charts/new-relic/nri-bundle/charts/pixie-operator-chart/templates/deleter.yaml @@ -19,7 +19,7 @@ spec: fieldPath: metadata.namespace - name: PL_VIZIER_NAME value: '{{ .Values.name }}' - image: gcr.io/pixie-oss/pixie-prod/operator/vizier_deleter:0.0.35 + image: gcr.io/pixie-oss/pixie-prod/operator/vizier_deleter:0.0.38 name: delete-job restartPolicy: Never serviceAccountName: pl-deleter-service-account diff --git a/charts/speedscale/speedscale-operator/Chart.yaml b/charts/speedscale/speedscale-operator/Chart.yaml index fd925ca05..6c5f4f579 100644 --- a/charts/speedscale/speedscale-operator/Chart.yaml +++ b/charts/speedscale/speedscale-operator/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.17.0-0' catalog.cattle.io/release-name: speedscale-operator apiVersion: v1 -appVersion: 1.2.416 +appVersion: 1.2.447 description: Stress test your APIs with real world scenarios. Collect and replay traffic without scripting. home: https://speedscale.com @@ -24,4 +24,4 @@ maintainers: - email: support@speedscale.com name: Speedscale Support name: speedscale-operator -version: 1.2.26 +version: 1.2.27 diff --git a/charts/speedscale/speedscale-operator/README.md b/charts/speedscale/speedscale-operator/README.md index f9e48fe23..4856935ff 100644 --- a/charts/speedscale/speedscale-operator/README.md +++ b/charts/speedscale/speedscale-operator/README.md @@ -101,10 +101,10 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. -### Upgrade to 1.2.26 +### Upgrade to 1.2.27 ```bash -kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.2.26/templates/crds/trafficreplays.yaml +kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.2.27/templates/crds/trafficreplays.yaml ``` ### Upgrade to 1.1.0 diff --git a/charts/speedscale/speedscale-operator/app-readme.md b/charts/speedscale/speedscale-operator/app-readme.md index f9e48fe23..4856935ff 100644 --- a/charts/speedscale/speedscale-operator/app-readme.md +++ b/charts/speedscale/speedscale-operator/app-readme.md @@ -101,10 +101,10 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. -### Upgrade to 1.2.26 +### Upgrade to 1.2.27 ```bash -kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.2.26/templates/crds/trafficreplays.yaml +kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.2.27/templates/crds/trafficreplays.yaml ``` ### Upgrade to 1.1.0 diff --git a/charts/speedscale/speedscale-operator/templates/admission.yaml b/charts/speedscale/speedscale-operator/templates/admission.yaml index 2715b379a..66f35e18d 100644 --- a/charts/speedscale/speedscale-operator/templates/admission.yaml +++ b/charts/speedscale/speedscale-operator/templates/admission.yaml @@ -34,7 +34,18 @@ webhooks: path: /mutate failurePolicy: Ignore name: sidecar.speedscale.com + {{- if .Values.namespaceSelector }} + namespaceSelector: + matchExpressions: + - key: kubernetes.io/metadata.name + operator: "In" + values: + {{- range .Values.namespaceSelector }} + - {{ . | quote }} + {{- end }} + {{- else }} namespaceSelector: {} + {{- end }} rules: - apiGroups: - apps @@ -73,7 +84,18 @@ webhooks: path: /mutate-speedscale-com-v1-trafficreplay failurePolicy: Fail name: replay.speedscale.com + {{- if .Values.namespaceSelector }} + namespaceSelector: + matchExpressions: + - key: kubernetes.io/metadata.name + operator: "In" + values: + {{- range .Values.namespaceSelector }} + - {{ . | quote }} + {{- end }} + {{- else }} namespaceSelector: {} + {{- end }} rules: - apiGroups: - speedscale.com @@ -106,7 +128,18 @@ webhooks: path: /validate-speedscale-com-v1-trafficreplay failurePolicy: Fail name: replay.speedscale.com + {{- if .Values.namespaceSelector }} + namespaceSelector: + matchExpressions: + - key: kubernetes.io/metadata.name + operator: "In" + values: + {{- range .Values.namespaceSelector }} + - {{ . | quote }} + {{- end }} + {{- else }} namespaceSelector: {} + {{- end }} rules: - apiGroups: - speedscale.com diff --git a/charts/speedscale/speedscale-operator/values.yaml b/charts/speedscale/speedscale-operator/values.yaml index a64d969c8..77bf735ab 100644 --- a/charts/speedscale/speedscale-operator/values.yaml +++ b/charts/speedscale/speedscale-operator/values.yaml @@ -20,7 +20,7 @@ clusterName: "my-cluster" # Speedscale components image settings. image: registry: gcr.io/speedscale - tag: v1.2.416 + tag: v1.2.447 pullPolicy: Always # Log level for Speedscale components. diff --git a/charts/sysdig/sysdig/CHANGELOG.md b/charts/sysdig/sysdig/CHANGELOG.md index af72b523d..9fd2c5b18 100644 --- a/charts/sysdig/sysdig/CHANGELOG.md +++ b/charts/sysdig/sysdig/CHANGELOG.md @@ -10,6 +10,9 @@ Manual edits are supported only below '## Change Log' and should be used exclusively to fix incorrect entries and not to add new ones. ## Change Log +# v1.15.80 +### New Features +* **agent** [d48ef54](https://github.com/sysdiglabs/charts/commit/d48ef54afb4c79c72d8b51a77d8e101f9d25a4f4): Add poddisruptionbudget permissions to the Agent clusterrole ([#968](https://github.com/sysdiglabs/charts/issues/968)) # v1.15.79 ### New Features * **sysdig** [eb8d0bc](https://github.com/sysdiglabs/charts/commit/eb8d0bc4a990036aef0c298e6aaaef0dd6ff9f85): Update legacy engine NIA/HostAnalyzer components with security updates ([#987](https://github.com/sysdiglabs/charts/issues/987)) diff --git a/charts/sysdig/sysdig/Chart.yaml b/charts/sysdig/sysdig/Chart.yaml index 98861b108..58add25c6 100644 --- a/charts/sysdig/sysdig/Chart.yaml +++ b/charts/sysdig/sysdig/Chart.yaml @@ -29,4 +29,4 @@ name: sysdig sources: - https://app.sysdigcloud.com/#/settings/user - https://github.com/draios/sysdig -version: 1.15.79 +version: 1.15.80 diff --git a/charts/sysdig/sysdig/RELEASE-NOTES.md b/charts/sysdig/sysdig/RELEASE-NOTES.md index f87f1b185..34cc52e02 100644 --- a/charts/sysdig/sysdig/RELEASE-NOTES.md +++ b/charts/sysdig/sysdig/RELEASE-NOTES.md @@ -1,6 +1,6 @@ # What's Changed ### New Features -- **sysdig** [eb8d0bc](https://github.com/sysdiglabs/charts/commit/eb8d0bc4a990036aef0c298e6aaaef0dd6ff9f85): Update legacy engine NIA/HostAnalyzer components with security updates ([#987](https://github.com/sysdiglabs/charts/issues/987)) +- **agent** [d48ef54](https://github.com/sysdiglabs/charts/commit/d48ef54afb4c79c72d8b51a77d8e101f9d25a4f4): Add poddisruptionbudget permissions to the Agent clusterrole ([#968](https://github.com/sysdiglabs/charts/issues/968)) -#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.5.78...sysdig-1.15.79 +#### Full diff: https://github.com/sysdiglabs/charts/compare/sysdig-deploy-1.6.2...sysdig-1.15.80 diff --git a/charts/sysdig/sysdig/templates/clusterrole.yaml b/charts/sysdig/sysdig/templates/clusterrole.yaml index ad38972eb..d3897ac1a 100644 --- a/charts/sysdig/sysdig/templates/clusterrole.yaml +++ b/charts/sysdig/sysdig/templates/clusterrole.yaml @@ -103,6 +103,14 @@ rules: - get - list - watch + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - get + - list + - watch {{- if .Values.psp.create }} - apiGroups: - "policy" diff --git a/index.yaml b/index.yaml index e40d6daf9..fc2f65693 100644 --- a/index.yaml +++ b/index.yaml @@ -7195,6 +7195,28 @@ entries: - assets/kubecost/cost-analyzer-1.70.000.tgz version: 1.70.000 crate-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: CrateDB Operator + catalog.cattle.io/release-name: crate-operator + apiVersion: v2 + appVersion: 2.25.0 + created: "2023-03-23T13:50:41.625775833Z" + dependencies: + - condition: crate-operator-crds.enabled + name: crate-operator-crds + repository: file://./charts/crate-operator-crds + version: 2.25.0 + description: Crate Operator - Helm chart for installing and upgrading Crate Operator. + digest: 29bb4c979c761362884cc73c179c92179ccfaad9de7ffe0bed834df68dfa5d5f + icon: https://raw.githubusercontent.com/crate/crate/master/docs/_static/crate-logo.svg + maintainers: + - name: Crate.io + name: crate-operator + type: application + urls: + - assets/crate/crate-operator-2.25.0.tgz + version: 2.25.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: CrateDB Operator @@ -7660,6 +7682,43 @@ entries: - assets/weka/csi-wekafsplugin-0.6.400.tgz version: 0.6.400 datadog: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Datadog + catalog.cattle.io/kube-version: '>=1.10-0' + catalog.cattle.io/release-name: datadog + apiVersion: v1 + appVersion: "7" + created: "2023-03-23T13:50:41.762580568Z" + dependencies: + - condition: clusterAgent.metricsProvider.useDatadogMetrics + name: datadog-crds + repository: https://helm.datadoghq.com + tags: + - install-crds + version: 0.4.7 + - condition: datadog.kubeStateMetricsEnabled + name: kube-state-metrics + repository: https://prometheus-community.github.io/helm-charts + version: 2.13.2 + description: Datadog Agent + digest: 6a732d1ccedb0b8ad75e84df496ff9cd42d6000d3f04fc92191976faabe8f92f + home: https://www.datadoghq.com + icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png + keywords: + - monitoring + - alerting + - metric + maintainers: + - email: support@datadoghq.com + name: Datadog + name: datadog + sources: + - https://app.datadoghq.com/account/settings#agent/kubernetes + - https://github.com/DataDog/datadog-agent + urls: + - assets/datadog/datadog-3.21.0.tgz + version: 3.21.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Datadog @@ -8979,6 +9038,33 @@ entries: - assets/dynatrace/dynatrace-oneagent-operator-0.8.000.tgz version: 0.8.000 dynatrace-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Dynatrace Operator + catalog.cattle.io/kube-version: '>=1.21.0-0' + catalog.cattle.io/release-name: dynatrace-operator + apiVersion: v2 + appVersion: 0.10.4 + created: "2023-03-23T13:50:41.916158704Z" + description: The Dynatrace Operator Helm chart for Kubernetes and OpenShift + digest: ae4cca47c99dadef3bc92713a6775dd12b630e518dda926924efb0f3e6bad095 + home: https://www.dynatrace.com/ + icon: https://assets.dynatrace.com/global/resources/Signet_Logo_RGB_CP_512x512px.png + kubeVersion: '>=1.21.0-0' + maintainers: + - email: marcell.sevcsik@dynatrace.com + name: 0sewa0 + - email: christoph.muellner@dynatrace.com + name: chrismuellner + - email: lukas.hinterreiter@dynatrace.com + name: luhi-DT + name: dynatrace-operator + sources: + - https://github.com/Dynatrace/dynatrace-operator + type: application + urls: + - assets/dynatrace/dynatrace-operator-0.10.4.tgz + version: 0.10.4 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Dynatrace Operator @@ -10284,6 +10370,70 @@ entries: - assets/inaccel/fpga-operator-2.5.201.tgz version: 2.5.201 gitlab: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: GitLab + catalog.cattle.io/release-name: gitlab + apiVersion: v1 + appVersion: 15.10.0 + created: "2023-03-23T13:50:42.058936011Z" + dependencies: + - name: gitlab + repository: "" + version: '*.*.*' + - name: certmanager-issuer + repository: "" + version: '*.*.*' + - name: minio + repository: "" + version: '*.*.*' + - name: registry + repository: "" + version: '*.*.*' + - alias: certmanager + condition: certmanager.install + name: cert-manager + repository: https://charts.jetstack.io/ + version: 1.5.4 + - condition: prometheus.install + name: prometheus + repository: https://prometheus-community.github.io/helm-charts + version: 15.18.0 + - condition: postgresql.install + name: postgresql + repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami + version: 8.9.4 + - condition: gitlab-runner.install + name: gitlab-runner + repository: https://charts.gitlab.io/ + version: 0.51.0 + - condition: global.grafana.enabled + name: grafana + repository: https://grafana.github.io/helm-charts + version: 6.11.0 + - condition: redis.install + name: redis + repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami + version: 11.3.4 + - condition: nginx-ingress.enabled + name: nginx-ingress + repository: "" + version: '*.*.*' + description: The One DevOps Platform + digest: d580039edf4858bbffb38fd11ca8c1f571441b85c3ace0febccc39f9fb29c689 + home: https://about.gitlab.com/ + icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png + keywords: + - gitlab + maintainers: + - email: support@gitlab.com + name: GitLab Inc. + name: gitlab + sources: + - https://gitlab.com/gitlab-org/charts/gitlab + urls: + - assets/gitlab/gitlab-6.10.0.tgz + version: 6.10.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: GitLab @@ -15386,6 +15536,48 @@ entries: - assets/kasten/k10-4.5.900.tgz version: 4.5.900 kafka: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Kafka + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: kafka + category: Infrastructure + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 3.4.0 + created: "2023-03-23T13:50:40.690808555Z" + dependencies: + - condition: zookeeper.enabled + name: zookeeper + repository: file://./charts/zookeeper + version: 11.x.x + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Kafka is a distributed streaming platform designed to build + real-time pipelines and can be used as a message broker or as a replacement + for a log aggregation solution for big data applications. + digest: ec043a325dd484c7bfda3a22d1645c9aca676cde325d22e7aa1d697e8e16df12 + home: https://github.com/bitnami/charts/tree/main/bitnami/kafka + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/kafka.svg + keywords: + - kafka + - zookeeper + - streaming + - producer + - consumer + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: kafka + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/kafka + - https://kafka.apache.org/ + urls: + - assets/bitnami/kafka-21.4.1.tgz + version: 21.4.1 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Kafka @@ -16613,6 +16805,69 @@ entries: urls: - assets/kong/kong-2.3.1.tgz version: 2.3.1 + kubemq-cluster: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ Cluster + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-cluster + apiVersion: v2 + appVersion: 2.3.7 + created: "2023-03-23T13:50:44.135170132Z" + description: A Helm chart for KubeMQ Cluster, Kubernetes Message Queue Broker + digest: 6f84d6c6919ae7123acdb78306531411988bda58512f231f6413cf11e84ddb8a + icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg + maintainers: + - email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io + name: kubemq-cluster + type: application + urls: + - assets/kubemq/kubemq-cluster-2.3.7.tgz + version: 2.3.7 + kubemq-controller: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ Controller + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-controller + apiVersion: v2 + appVersion: 1.9.3 + created: "2023-03-23T13:50:44.135479536Z" + description: A Helm chart for KubeMQ Controller + digest: 26a1c28fe74b7bb2191fd3f29e6f82ee744aa81e42a647de4f3088d8836dbe24 + icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg + maintainers: + - email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io + name: kubemq-controller + type: application + urls: + - assets/kubemq/kubemq-controller-1.9.3.tgz + version: 1.9.3 + kubemq-crds: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: KubeMQ CRDs + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: kubemq-crds + apiVersion: v2 + appVersion: 2.3.7 + created: "2023-03-23T13:50:44.135750739Z" + description: A Helm chart for KubeMQ CRD + digest: 8d8680adeca9b2c7e8d1ec0bb2ae83329664da76f1f017f6ede1b54c66a7df11 + icon: https://kubemq.io/wp-content/uploads/2018/08/logo-header.svg + maintainers: + - email: info@kubemq.io + name: KubeMQ + url: https://kubemq.io + name: kubemq-crds + type: application + urls: + - assets/kubemq/kubemq-crds-2.3.7.tgz + version: 2.3.7 kubeslice-controller: - annotations: catalog.cattle.io/certified: partner @@ -17357,6 +17612,45 @@ entries: - assets/elastic/logstash-7.17.3.tgz version: 7.17.3 mariadb: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: MariaDB + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: mariadb + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 10.6.12 + created: "2023-03-23T13:50:40.749039651Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: MariaDB is an open source, community-developed SQL database server + that is widely in use around the world due to its enterprise features, flexibility, + and collaboration with leading tech firms. + digest: 02fa34555a31ce6c7873c2bcd1364a58a475304e125f42418f8366a6c85dffc5 + home: https://github.com/bitnami/charts/tree/main/bitnami/mariadb + icon: https://mariadb.com/wp-content/uploads/2019/11/mariadb-logo-vert_black-transparent.png + keywords: + - mariadb + - mysql + - database + - sql + - prometheus + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: mariadb + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/mariadb + - https://github.com/prometheus/mysqld_exporter + - https://mariadb.org + urls: + - assets/bitnami/mariadb-11.5.5.tgz + version: 11.5.5 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: MariaDB @@ -18043,6 +18337,44 @@ entries: - assets/minio/minio-operator-4.4.1700.tgz version: 4.4.1700 mysql: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: MySQL + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: mysql + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 8.0.32 + created: "2023-03-23T13:50:40.787527111Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: MySQL is a fast, reliable, scalable, and easy to use open source + relational database system. Designed to handle mission-critical, heavy-load + production applications. + digest: e1a17f2ab40f182add541d026c3562868fcc6017995ea860420e5ca2f272f561 + home: https://github.com/bitnami/charts/tree/main/bitnami/mysql + icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png + keywords: + - mysql + - database + - sql + - cluster + - high availability + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: mysql + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/mysql + - https://mysql.com + urls: + - assets/bitnami/mysql-9.7.0.tgz + version: 9.7.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: MySQL @@ -19339,6 +19671,102 @@ entries: - assets/f5/nginx-service-mesh-0.2.100.tgz version: 0.2.100 nri-bundle: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: New Relic + catalog.cattle.io/release-name: nri-bundle + apiVersion: v2 + created: "2023-03-23T13:50:44.302625334Z" + dependencies: + - condition: infrastructure.enabled,newrelic-infrastructure.enabled + name: newrelic-infrastructure + repository: file://./charts/newrelic-infrastructure + version: 3.14.0 + - condition: prometheus.enabled,nri-prometheus.enabled + name: nri-prometheus + repository: file://./charts/nri-prometheus + version: 2.1.16 + - condition: newrelic-prometheus-agent.enabled + name: newrelic-prometheus-agent + repository: file://./charts/newrelic-prometheus-agent + version: 1.1.1 + - condition: webhook.enabled,nri-metadata-injection.enabled + name: nri-metadata-injection + repository: file://./charts/nri-metadata-injection + version: 4.2.1 + - condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled + name: newrelic-k8s-metrics-adapter + repository: file://./charts/newrelic-k8s-metrics-adapter + version: 1.1.2 + - condition: ksm.enabled,kube-state-metrics.enabled + name: kube-state-metrics + repository: file://./charts/kube-state-metrics + version: 4.23.0 + - condition: kubeEvents.enabled,nri-kube-events.enabled + name: nri-kube-events + repository: file://./charts/nri-kube-events + version: 2.3.3 + - condition: logging.enabled,newrelic-logging.enabled + name: newrelic-logging + repository: file://./charts/newrelic-logging + version: 1.13.1 + - condition: newrelic-pixie.enabled + name: newrelic-pixie + repository: file://./charts/newrelic-pixie + version: 2.0.6 + - alias: pixie-chart + condition: pixie-chart.enabled + name: pixie-operator-chart + repository: file://./charts/pixie-operator-chart + version: 0.0.38 + - condition: newrelic-infra-operator.enabled + name: newrelic-infra-operator + repository: file://./charts/newrelic-infra-operator + version: 2.1.1 + description: Groups together the individual charts for the New Relic Kubernetes + solution for a more comfortable deployment. + digest: 8dbb371ea958a20082620ee0bf34cead843a0c7267787358ba1374f2ac9daf74 + home: https://github.com/newrelic/helm-charts + icon: https://newrelic.com/themes/custom/erno/assets/mediakit/new_relic_logo_vertical.svg + keywords: + - infrastructure + - newrelic + - monitoring + maintainers: + - name: nserrino + url: https://github.com/nserrino + - name: philkuz + url: https://github.com/philkuz + - name: htroisi + url: https://github.com/htroisi + - name: juanjjaramillo + url: https://github.com/juanjjaramillo + - name: svetlanabrennan + url: https://github.com/svetlanabrennan + - name: nrepai + url: https://github.com/nrepai + - name: csongnr + url: https://github.com/csongnr + - name: vuqtran88 + url: https://github.com/vuqtran88 + - name: xqi-nr + url: https://github.com/xqi-nr + name: nri-bundle + sources: + - https://github.com/newrelic/nri-bundle/ + - https://github.com/newrelic/nri-bundle/tree/master/charts/nri-bundle + - https://github.com/newrelic/nri-kubernetes/tree/master/charts/newrelic-infrastructure + - https://github.com/newrelic/nri-prometheus/tree/master/charts/nri-prometheus + - https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent + - https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection + - https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/master/charts/newrelic-k8s-metrics-adapter + - https://github.com/newrelic/nri-kube-events/tree/master/charts/nri-kube-events + - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging + - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie + - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator + urls: + - assets/new-relic/nri-bundle-5.0.6.tgz + version: 5.0.6 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: New Relic @@ -21163,6 +21591,45 @@ entries: - assets/portworx/portworx-essentials-2.9.100.tgz version: 2.9.100 postgresql: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: PostgreSQL + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: postgresql + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 15.2.0 + created: "2023-03-23T13:50:40.884646372Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: PostgreSQL (Postgres) is an open source object-relational database + known for reliability and data integrity. ACID-compliant, it supports foreign + keys, joins, views, triggers and stored procedures. + digest: e204675c96d4acf625d44db1b64c8f9258fd0d2bc67f04bbf594ccc9f9371895 + home: https://github.com/bitnami/charts/tree/main/bitnami/postgresql + icon: https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg + keywords: + - postgresql + - postgres + - database + - sql + - replication + - cluster + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: postgresql + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/postgresql + - https://www.postgresql.org/ + urls: + - assets/bitnami/postgresql-12.2.6.tgz + version: 12.2.6 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: PostgreSQL @@ -22267,6 +22734,41 @@ entries: - assets/quobyte/quobyte-cluster-0.1.5.tgz version: 0.1.5 redis: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Redis + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: redis + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 7.0.10 + created: "2023-03-23T13:50:41.026404767Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Redis(R) is an open source, advanced key-value store. It is often + referred to as a data structure server since keys can contain strings, hashes, + lists, sets and sorted sets. + digest: ac84bc9846aa53e167ea12ad462d20dff6dafd01d4cf3f404c4f827f6811e539 + home: https://github.com/bitnami/charts/tree/main/bitnami/redis + icon: https://redis.com/wp-content/uploads/2021/08/redis-logo.png + keywords: + - redis + - keyvalue + - database + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: redis + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/redis + urls: + - assets/bitnami/redis-17.9.0.tgz + version: 17.9.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Redis @@ -25313,6 +25815,37 @@ entries: - assets/bitnami/spark-6.3.8.tgz version: 6.3.8 speedscale-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Speedscale Operator + catalog.cattle.io/kube-version: '>= 1.17.0-0' + catalog.cattle.io/release-name: speedscale-operator + apiVersion: v1 + appVersion: 1.2.447 + created: "2023-03-23T13:50:44.72308226Z" + description: Stress test your APIs with real world scenarios. Collect and replay + traffic without scripting. + digest: a0016cd1c145561b1e7646e8c01b92732097a92a0cec9ae7024696939e5e8d0b + home: https://speedscale.com + icon: https://raw.githubusercontent.com/speedscale/assets/main/logo/gold_logo_only.png + keywords: + - speedscale + - test + - testing + - regression + - reliability + - load + - replay + - network + - traffic + kubeVersion: '>= 1.17.0-0' + maintainers: + - email: support@speedscale.com + name: Speedscale Support + name: speedscale-operator + urls: + - assets/speedscale/speedscale-operator-1.2.27.tgz + version: 1.2.27 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Speedscale Operator @@ -26140,6 +26673,42 @@ entries: - assets/sumologic/sumologic-2.17.0.tgz version: 2.17.0 sysdig: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Sysdig + catalog.cattle.io/release-name: sysdig + apiVersion: v1 + appVersion: 12.12.1 + created: "2023-03-23T13:50:44.961855515Z" + description: Sysdig Monitor and Secure agent + digest: f167d6324203209956dce93f75957d59e4001cecd823b5adbc0566cd7b7b3684 + home: https://www.sysdig.com/ + icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4 + keywords: + - monitoring + - security + - alerting + - metric + - troubleshooting + - run-time + maintainers: + - email: lachlan@deis.com + name: lachie83 + - email: jorge.salamero@sysdig.com + name: bencer + - email: nestor.salceda@sysdig.com + name: nestorsalceda + - email: alvaro.iradier@sysdig.com + name: airadier + - email: carlos.arilla@sysdig.com + name: carillan81 + name: sysdig + sources: + - https://app.sysdigcloud.com/#/settings/user + - https://github.com/draios/sysdig + urls: + - assets/sysdig/sysdig-1.15.80.tgz + version: 1.15.80 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Sysdig @@ -26785,6 +27354,45 @@ entries: - assets/intel/tcs-issuer-0.1.0.tgz version: 0.1.0 tomcat: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Tomcat + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: tomcat + category: ApplicationServer + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 10.1.7 + created: "2023-03-23T13:50:41.122678718Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Tomcat is an open-source web server designed to host and run + Java-based web applications. It is a lightweight server with a good performance + for applications running in production environments. + digest: 909d3e8f72ce1ad8ff31a5c0f5128dd0bc67189c40fa05aad4bd445927f622d8 + home: https://github.com/bitnami/charts/tree/main/bitnami/tomcat + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/tomcat.svg + keywords: + - tomcat + - java + - http + - web + - application server + - jsp + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: tomcat + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/tomcat + - http://tomcat.apache.org + urls: + - assets/bitnami/tomcat-10.6.0.tgz + version: 10.6.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Tomcat @@ -28395,6 +29003,27 @@ entries: - assets/universal-crossplane/universal-crossplane-1.2.200100.tgz version: 1.2.200100 vals-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Vals-Operator + catalog.cattle.io/kube-version: '>= 1.19.0-0' + catalog.cattle.io/release-name: vals-operator + apiVersion: v2 + appVersion: 0.7.2 + created: "2023-03-23T13:50:41.901186625Z" + description: This helm chart installs the Digitalis Vals Operator to manage sync + secrets from supported backends into Kubernetes + digest: dd3b8583e25437ded6ac4417f96d5c2f770323371e56a67c13749999b7f3c66d + icon: https://digitalis.io/wp-content/uploads/2020/06/cropped-Digitalis-512x512-Blue_Digitalis-512x512-Blue-32x32.png + kubeVersion: '>= 1.19.0-0' + maintainers: + - email: info@digitalis.io + name: Digitalis.IO + name: vals-operator + type: application + urls: + - assets/digitalis/vals-operator-0.7.2.tgz + version: 0.7.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Vals-Operator @@ -28667,6 +29296,54 @@ entries: - assets/hashicorp/vault-0.22.0.tgz version: 0.22.0 wordpress: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: WordPress + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: wordpress + category: CMS + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 6.1.1 + created: "2023-03-23T13:50:41.41642043Z" + dependencies: + - condition: memcached.enabled + name: memcached + repository: file://./charts/memcached + version: 6.x.x + - condition: mariadb.enabled + name: mariadb + repository: file://./charts/mariadb + version: 11.x.x + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: WordPress is the world's most popular blogging and content management + platform. Powerful yet simple, everyone from students to global corporations + use it to build beautiful, functional websites. + digest: a838ad54cde9022230a4b65101a026c582e19b040b1186a70f75a752f4541c81 + home: https://github.com/bitnami/charts/tree/main/bitnami/wordpress + icon: https://s.w.org/style/images/about/WordPress-logotype-simplified.png + keywords: + - application + - blog + - cms + - http + - php + - web + - wordpress + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: wordpress + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/wordpress + - https://wordpress.org/ + urls: + - assets/bitnami/wordpress-15.2.57.tgz + version: 15.2.57 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: WordPress