diff --git a/assets/argo/argo-cd-5.32.1.tgz b/assets/argo/argo-cd-5.32.1.tgz new file mode 100644 index 000000000..5cd0c1d8a Binary files /dev/null and b/assets/argo/argo-cd-5.32.1.tgz differ diff --git a/assets/asserts/asserts-1.38.0.tgz b/assets/asserts/asserts-1.38.0.tgz new file mode 100644 index 000000000..35bf695ea Binary files /dev/null and b/assets/asserts/asserts-1.38.0.tgz differ diff --git a/assets/bitnami/redis-17.10.2.tgz b/assets/bitnami/redis-17.10.2.tgz new file mode 100644 index 000000000..d3bf307a6 Binary files /dev/null and b/assets/bitnami/redis-17.10.2.tgz differ diff --git a/assets/bitnami/spark-6.5.2.tgz b/assets/bitnami/spark-6.5.2.tgz new file mode 100644 index 000000000..4538bab7c Binary files /dev/null and b/assets/bitnami/spark-6.5.2.tgz differ diff --git a/assets/cockroach-labs/cockroachdb-10.0.9.tgz b/assets/cockroach-labs/cockroachdb-10.0.9.tgz new file mode 100644 index 000000000..cbec3549c Binary files /dev/null and b/assets/cockroach-labs/cockroachdb-10.0.9.tgz differ diff --git a/assets/crate/crate-operator-2.27.0.tgz b/assets/crate/crate-operator-2.27.0.tgz new file mode 100644 index 000000000..4a0a9e879 Binary files /dev/null and b/assets/crate/crate-operator-2.27.0.tgz differ diff --git a/assets/f5/nginx-ingress-0.17.0.tgz b/assets/f5/nginx-ingress-0.17.0.tgz index 0a019eb8c..3086a9d8c 100644 Binary files a/assets/f5/nginx-ingress-0.17.0.tgz and b/assets/f5/nginx-ingress-0.17.0.tgz differ diff --git a/assets/f5/nginx-ingress-0.17.1.tgz b/assets/f5/nginx-ingress-0.17.1.tgz new file mode 100644 index 000000000..0f40adf7c Binary files /dev/null and b/assets/f5/nginx-ingress-0.17.1.tgz differ diff --git a/assets/gitlab/gitlab-6.11.2.tgz b/assets/gitlab/gitlab-6.11.2.tgz new file mode 100644 index 000000000..2e40e6372 Binary files /dev/null and b/assets/gitlab/gitlab-6.11.2.tgz differ diff --git a/assets/jfrog/artifactory-ha-107.55.13.tgz b/assets/jfrog/artifactory-ha-107.55.13.tgz new file mode 100644 index 000000000..3cd601ce2 Binary files /dev/null and b/assets/jfrog/artifactory-ha-107.55.13.tgz differ diff --git a/assets/jfrog/artifactory-jcr-107.55.13.tgz b/assets/jfrog/artifactory-jcr-107.55.13.tgz new file mode 100644 index 000000000..7622c7221 Binary files /dev/null and b/assets/jfrog/artifactory-jcr-107.55.13.tgz differ diff --git a/assets/kasten/k10-5.5.1001.tgz b/assets/kasten/k10-5.5.1001.tgz new file mode 100644 index 000000000..ef40952b5 Binary files /dev/null and b/assets/kasten/k10-5.5.1001.tgz differ diff --git a/assets/kasten/k10-5.5.901.tgz b/assets/kasten/k10-5.5.901.tgz index f39b7c3ae..b0816f47a 100644 Binary files a/assets/kasten/k10-5.5.901.tgz and b/assets/kasten/k10-5.5.901.tgz differ diff --git a/assets/kubecost/cost-analyzer-1.102.2.tgz b/assets/kubecost/cost-analyzer-1.102.2.tgz index 095914bf5..8a4cc281a 100644 Binary files a/assets/kubecost/cost-analyzer-1.102.2.tgz and b/assets/kubecost/cost-analyzer-1.102.2.tgz differ diff --git a/assets/kubecost/cost-analyzer-1.103.1.tgz b/assets/kubecost/cost-analyzer-1.103.1.tgz new file mode 100644 index 000000000..10f725bd4 Binary files /dev/null and b/assets/kubecost/cost-analyzer-1.103.1.tgz differ diff --git a/assets/loft/loft-3.1.1.tgz b/assets/loft/loft-3.1.1.tgz new file mode 100644 index 000000000..73ef3d223 Binary files /dev/null and b/assets/loft/loft-3.1.1.tgz differ diff --git a/assets/new-relic/nri-bundle-5.0.12.tgz b/assets/new-relic/nri-bundle-5.0.12.tgz new file mode 100644 index 000000000..490c34833 Binary files /dev/null and b/assets/new-relic/nri-bundle-5.0.12.tgz differ diff --git a/assets/pixie/pixie-operator-chart-0.1.1.tgz b/assets/pixie/pixie-operator-chart-0.1.1.tgz index 58c3c34da..6d4c7080d 100644 Binary files a/assets/pixie/pixie-operator-chart-0.1.1.tgz and b/assets/pixie/pixie-operator-chart-0.1.1.tgz differ diff --git a/assets/redpanda/redpanda-4.0.16.tgz b/assets/redpanda/redpanda-4.0.16.tgz new file mode 100644 index 000000000..00b291e77 Binary files /dev/null and b/assets/redpanda/redpanda-4.0.16.tgz differ diff --git a/charts/argo/argo-cd/Chart.yaml b/charts/argo/argo-cd/Chart.yaml index e4a46076a..974e5755d 100644 --- a/charts/argo/argo-cd/Chart.yaml +++ b/charts/argo/argo-cd/Chart.yaml @@ -1,7 +1,7 @@ annotations: artifacthub.io/changes: | - - kind: changed - description: Update Argo CD v2.7.1 + - kind: added + description: Enable to customize Service type of applicationset-controller catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Argo CD catalog.cattle.io/kube-version: '>=1.22.0-0' @@ -29,4 +29,4 @@ name: argo-cd sources: - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd - https://github.com/argoproj/argo-cd -version: 5.31.1 +version: 5.32.1 diff --git a/charts/argo/argo-cd/README.md b/charts/argo/argo-cd/README.md index f1f0845fc..054dc2f9c 100644 --- a/charts/argo/argo-cd/README.md +++ b/charts/argo/argo-cd/README.md @@ -1079,6 +1079,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide | applicationSet.service.labels | object | `{}` | ApplicationSet service labels | | applicationSet.service.port | int | `7000` | ApplicationSet service port | | applicationSet.service.portName | string | `"webhook"` | ApplicationSet service port name | +| applicationSet.service.type | string | `"ClusterIP"` | ApplicationSet service type | | applicationSet.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | | applicationSet.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | | applicationSet.serviceAccount.create | bool | `true` | Create ApplicationSet controller service account | diff --git a/charts/argo/argo-cd/templates/argocd-applicationset/service.yaml b/charts/argo/argo-cd/templates/argocd-applicationset/service.yaml index 640b195a7..e3a07b6f5 100644 --- a/charts/argo/argo-cd/templates/argocd-applicationset/service.yaml +++ b/charts/argo/argo-cd/templates/argocd-applicationset/service.yaml @@ -16,6 +16,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + type: {{ .Values.applicationSet.service.type }} ports: - name: {{ .Values.applicationSet.service.portName }} port: {{ .Values.applicationSet.service.port }} diff --git a/charts/argo/argo-cd/templates/extra-manifests.yaml b/charts/argo/argo-cd/templates/extra-manifests.yaml index a9bb3b6ba..f17b1a93b 100644 --- a/charts/argo/argo-cd/templates/extra-manifests.yaml +++ b/charts/argo/argo-cd/templates/extra-manifests.yaml @@ -1,4 +1,8 @@ {{ range .Values.extraObjects }} --- -{{ tpl (toYaml .) $ }} +{{- if typeIs "string" . }} + {{- tpl . $ }} +{{- else }} + {{- tpl (toYaml .) $ }} +{{- end }} {{ end }} diff --git a/charts/argo/argo-cd/values.yaml b/charts/argo/argo-cd/values.yaml index afdaa0955..3f95a663d 100644 --- a/charts/argo/argo-cd/values.yaml +++ b/charts/argo/argo-cd/values.yaml @@ -2432,6 +2432,8 @@ applicationSet: annotations: {} # -- ApplicationSet service labels labels: {} + # -- ApplicationSet service type + type: ClusterIP # -- ApplicationSet service port port: 7000 # -- ApplicationSet service port name diff --git a/charts/asserts/asserts/Chart.yaml b/charts/asserts/asserts/Chart.yaml index 631ddb596..1950676d4 100644 --- a/charts/asserts/asserts/Chart.yaml +++ b/charts/asserts/asserts/Chart.yaml @@ -58,4 +58,4 @@ maintainers: url: https://github.com/asserts name: asserts type: application -version: 1.37.0 +version: 1.38.0 diff --git a/charts/asserts/asserts/templates/server/configmap.yaml b/charts/asserts/asserts/templates/server/configmap.yaml index 0cf7a3843..b4e2a59de 100644 --- a/charts/asserts/asserts/templates/server/configmap.yaml +++ b/charts/asserts/asserts/templates/server/configmap.yaml @@ -265,6 +265,10 @@ data: name: VIEW_LICENSE_USAGE - description: Can delete a user name: DELETE_USER + - description: Can read otel collector config + name: CONFIG_OTEL_COLLECTOR + - description: Can write otel collector config + name: WRITE_OTEL_COLLECTOR roleToPermissionMap: API_INTEGRATION: "{OWNER}, {KNOWLEDGE_SENSOR}" @@ -272,7 +276,7 @@ data: ASSERTS_READONLY: "{VIEWER}" KNOWLEDGE_SENSOR: "READ_TENANT_RULES" OWNER: "{EDITOR}, MANAGE_USER_ROLES, DISABLE_PROM_RULES, INVITE_USERS, GRAFANA_ADMIN, CONFIG_AWS_CLOUDWATCH, WRITE_AWS_CLOUDWATCH, CONFIG_AUTH, WRITE_AUTH, MANAGE_LICENSE_INFO, CONFIG_PROMETHEUS, WRITE_PROMETHEUS, READ_TENANT_RULES, CONFIG_TENANT_CREDENTIAL, DELETE_USER" - EDITOR: "{VIEWER}, RULE_THRESHOLD, MANAGE_ALERTS, WRITE_ALERTS, CUSTOM_DASHBOARD, MANAGE_SLO, MANAGE_INTEGRATIONS, LIST_USERS, CONFIG_PROM_RULES, ACCESS_KEY_ALLOWED, CONFIG_RELABEL_RULES, CONFIG_AWS_EXPORTER, CONFIG_MODEL_RULES, WRITE_MODEL_RULES, WRITE_PROM_RULES, WRITE_RELABEL_RULES, WRITE_AWS_EXPORTER, WRITE_INTEGRATIONS, WRITE_SLO, WRITE_RULE_THRESHOLD, READ_TRACE_CONFIG, WRITE_TRACE_CONFIG, IMPORT_CONFIG, EXPORT_CONFIG, VIEW_LICENSE_USAGE" + EDITOR: "{VIEWER}, RULE_THRESHOLD, MANAGE_ALERTS, WRITE_ALERTS, CUSTOM_DASHBOARD, MANAGE_SLO, MANAGE_INTEGRATIONS, LIST_USERS, CONFIG_PROM_RULES, ACCESS_KEY_ALLOWED, CONFIG_RELABEL_RULES, CONFIG_AWS_EXPORTER, CONFIG_MODEL_RULES, WRITE_MODEL_RULES, WRITE_PROM_RULES, WRITE_RELABEL_RULES, WRITE_AWS_EXPORTER, WRITE_INTEGRATIONS, WRITE_SLO, WRITE_RULE_THRESHOLD, READ_TRACE_CONFIG, WRITE_TRACE_CONFIG, IMPORT_CONFIG, EXPORT_CONFIG, VIEW_LICENSE_USAGE, CONFIG_OTEL_COLLECTOR, WRITE_OTEL_COLLECTOR" VIEWER: "USER" roles: - description: Owner diff --git a/charts/bitnami/redis/Chart.yaml b/charts/bitnami/redis/Chart.yaml index e39a41d47..a4bfb1bbe 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.10.1 +version: 17.10.2 diff --git a/charts/bitnami/redis/README.md b/charts/bitnami/redis/README.md index 3b5f85769..7c2e13621 100644 --- a/charts/bitnami/redis/README.md +++ b/charts/bitnami/redis/README.md @@ -76,20 +76,22 @@ The command removes all the Kubernetes components associated with the chart and ### Common parameters -| Name | Description | Value | -| ------------------------ | --------------------------------------------------------------------------------------- | --------------- | -| `kubeVersion` | Override Kubernetes version | `""` | -| `nameOverride` | String to partially override common.names.fullname | `""` | -| `fullnameOverride` | String to fully override common.names.fullname | `""` | -| `commonLabels` | Labels to add to all deployed objects | `{}` | -| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | -| `secretAnnotations` | Annotations to add to secret | `{}` | -| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | -| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | -| `useHostnames` | Use hostnames internally when announcing replication | `true` | -| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | -| `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | -| `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | +| Name | Description | Value | +| ------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------- | +| `kubeVersion` | Override Kubernetes version | `""` | +| `nameOverride` | String to partially override common.names.fullname | `""` | +| `fullnameOverride` | String to fully override common.names.fullname | `""` | +| `commonLabels` | Labels to add to all deployed objects | `{}` | +| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | +| `secretAnnotations` | Annotations to add to secret | `{}` | +| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | +| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | +| `useHostnames` | Use hostnames internally when announcing replication. If false, the hostname will be resolved to an IP address | `true` | +| `nameResolutionThreshold` | Failure threshold for internal hostnames resolution | `5` | +| `nameResolutionTimeout` | Timeout seconds between probes for internal hostnames resolution | `5` | +| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | +| `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | +| `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | ### Redis® Image parameters @@ -946,4 +948,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. \ No newline at end of file +limitations under the License. diff --git a/charts/bitnami/redis/templates/scripts-configmap.yaml b/charts/bitnami/redis/templates/scripts-configmap.yaml index 96e2f1a0a..b15c44af7 100644 --- a/charts/bitnami/redis/templates/scripts-configmap.yaml +++ b/charts/bitnami/redis/templates/scripts-configmap.yaml @@ -54,7 +54,16 @@ data: {{- if .Values.useHostnames }} echo "${full_hostname}" {{- else }} - getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + retry_count=0 + until getent hosts "${full_hostname}" | awk '{ print $1; exit }' | grep .; do + if [[ $retry_count -lt {{ .Values.nameResolutionThreshold }} ]]; then + sleep {{ .Values.nameResolutionTimeout }} + else + error "IP address for ${full_hostname} not found" + exit 1 + fi + ((retry_count++)) + done {{- end }} } @@ -278,7 +287,16 @@ data: {{- if .Values.useHostnames }} echo "${full_hostname}" {{- else }} - getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + retry_count=0 + until getent hosts "${full_hostname}" | awk '{ print $1; exit }' | grep .; do + if [[ $retry_count -lt {{ .Values.nameResolutionThreshold }} ]]; then + sleep {{ .Values.nameResolutionTimeout }} + else + error "IP address for ${full_hostname} not found" + exit 1 + fi + ((retry_count++)) + done {{- end }} } @@ -448,7 +466,16 @@ data: {{- if .Values.useHostnames }} echo "${full_hostname}" {{- else }} - getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + retry_count=0 + until getent hosts "${full_hostname}" | awk '{ print $1; exit }' | grep .; do + if [[ $retry_count -lt {{ .Values.nameResolutionThreshold }} ]]; then + sleep {{ .Values.nameResolutionTimeout }} + else + error "IP address for ${full_hostname} not found" + exit 1 + fi + ((retry_count++)) + done {{- end }} } @@ -521,7 +548,16 @@ data: {{- if .Values.useHostnames }} echo "${full_hostname}" {{- else }} - getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + retry_count=0 + until getent hosts "${full_hostname}" | awk '{ print $1; exit }' | grep .; do + if [[ $retry_count -lt {{ .Values.nameResolutionThreshold }} ]]; then + sleep {{ .Values.nameResolutionTimeout }} + else + error "IP address for ${full_hostname} not found" + exit 1 + fi + ((retry_count++)) + done {{- end }} } @@ -650,7 +686,16 @@ data: {{- if .Values.useHostnames }} echo "${full_hostname}" {{- else }} - getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + retry_count=0 + until getent hosts "${full_hostname}" | awk '{ print $1; exit }' | grep .; do + if [[ $retry_count -lt {{ .Values.nameResolutionThreshold }} ]]; then + sleep {{ .Values.nameResolutionTimeout }} + else + error "IP address for ${full_hostname} not found" + exit 1 + fi + ((retry_count++)) + done {{- end }} } diff --git a/charts/bitnami/redis/values.yaml b/charts/bitnami/redis/values.yaml index 651fbd841..f047e75f7 100644 --- a/charts/bitnami/redis/values.yaml +++ b/charts/bitnami/redis/values.yaml @@ -47,9 +47,15 @@ clusterDomain: cluster.local ## @param extraDeploy Array of extra objects to deploy with the release ## extraDeploy: [] -## @param useHostnames Use hostnames internally when announcing replication -### +## @param useHostnames Use hostnames internally when announcing replication. If false, the hostname will be resolved to an IP address +## useHostnames: true +## @param nameResolutionThreshold Failure threshold for internal hostnames resolution +## +nameResolutionThreshold: 5 +## @param nameResolutionTimeout Timeout seconds between probes for internal hostnames resolution +## +nameResolutionTimeout: 5 ## Enable diagnostic mode in the deployment ## diff --git a/charts/bitnami/spark/Chart.lock b/charts/bitnami/spark/Chart.lock index 215e4b894..53adef337 100644 --- a/charts/bitnami/spark/Chart.lock +++ b/charts/bitnami/spark/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.2.4 -digest: sha256:829fc25cbbb396161e735c83d152d74a8b3a82d07f08866b885b812d30b920df -generated: "2023-04-20T09:36:58.526121+02:00" + version: 2.2.5 +digest: sha256:318f438acfeaced11d9060877d615caf1985417d2865810defaa886d3496f8d3 +generated: "2023-05-03T01:40:45.008497116Z" diff --git a/charts/bitnami/spark/Chart.yaml b/charts/bitnami/spark/Chart.yaml index 06a354e8b..0bf4881cd 100644 --- a/charts/bitnami/spark/Chart.yaml +++ b/charts/bitnami/spark/Chart.yaml @@ -28,4 +28,4 @@ name: spark sources: - https://github.com/bitnami/containers/tree/main/bitnami/spark - https://spark.apache.org/ -version: 6.5.1 +version: 6.5.2 diff --git a/charts/bitnami/spark/README.md b/charts/bitnami/spark/README.md index 0d1fec5e9..a6127136b 100644 --- a/charts/bitnami/spark/README.md +++ b/charts/bitnami/spark/README.md @@ -84,7 +84,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------- | ----------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | Spark image registry | `docker.io` | | `image.repository` | Spark image repository | `bitnami/spark` | -| `image.tag` | Spark image tag (immutable tags are recommended) | `3.3.2-debian-11-r13` | +| `image.tag` | Spark image tag (immutable tags are recommended) | `3.3.2-debian-11-r22` | | `image.digest` | Spark image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | Spark image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/charts/bitnami/spark/charts/common/Chart.yaml b/charts/bitnami/spark/charts/common/Chart.yaml index 8583e628a..8f0fff689 100644 --- a/charts/bitnami/spark/charts/common/Chart.yaml +++ b/charts/bitnami/spark/charts/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.2.4 +appVersion: 2.2.5 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.4 +version: 2.2.5 diff --git a/charts/bitnami/spark/charts/common/README.md b/charts/bitnami/spark/charts/common/README.md index 825639f2a..6381c3b72 100644 --- a/charts/bitnami/spark/charts/common/README.md +++ b/charts/bitnami/spark/charts/common/README.md @@ -1,6 +1,6 @@ # Bitnami Common Library Chart -A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between bitnami charts. +A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between Bitnami charts. ## TL;DR @@ -8,7 +8,7 @@ A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for gro dependencies: - name: common version: 1.x.x - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts ``` ```console diff --git a/charts/bitnami/spark/values.yaml b/charts/bitnami/spark/values.yaml index 2c92c4719..3cfdecdd0 100644 --- a/charts/bitnami/spark/values.yaml +++ b/charts/bitnami/spark/values.yaml @@ -92,7 +92,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/spark - tag: 3.3.2-debian-11-r13 + tag: 3.3.2-debian-11-r22 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/charts/cockroach-labs/cockroachdb/Chart.yaml b/charts/cockroach-labs/cockroachdb/Chart.yaml index a369d4de2..92a6d2d45 100644 --- a/charts/cockroach-labs/cockroachdb/Chart.yaml +++ b/charts/cockroach-labs/cockroachdb/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.8-0' catalog.cattle.io/release-name: cockroachdb apiVersion: v1 -appVersion: 22.2.8 +appVersion: 22.2.9 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database. home: https://www.cockroachlabs.com icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png @@ -14,4 +14,4 @@ maintainers: name: cockroachdb sources: - https://github.com/cockroachdb/cockroach -version: 10.0.8 +version: 10.0.9 diff --git a/charts/cockroach-labs/cockroachdb/README.md b/charts/cockroach-labs/cockroachdb/README.md index a542b6187..a8bae995f 100644 --- a/charts/cockroach-labs/cockroachdb/README.md +++ b/charts/cockroach-labs/cockroachdb/README.md @@ -229,10 +229,10 @@ kubectl get pods \ ``` ``` -my-release-cockroachdb-0 cockroachdb/cockroach:v22.2.8 -my-release-cockroachdb-1 cockroachdb/cockroach:v22.2.8 -my-release-cockroachdb-2 cockroachdb/cockroach:v22.2.8 -my-release-cockroachdb-3 cockroachdb/cockroach:v22.2.8 +my-release-cockroachdb-0 cockroachdb/cockroach:v22.2.9 +my-release-cockroachdb-1 cockroachdb/cockroach:v22.2.9 +my-release-cockroachdb-2 cockroachdb/cockroach:v22.2.9 +my-release-cockroachdb-3 cockroachdb/cockroach:v22.2.9 ``` Resume normal operations. Once you are comfortable that the stability and performance of the cluster is what you'd expect post-upgrade, finalize the upgrade: @@ -287,7 +287,7 @@ Verify that no pod is deleted and then upgrade as normal. A new StatefulSet will For more information about upgrading a cluster to the latest major release of CockroachDB, see [Upgrade to CockroachDB v21.1](https://www.cockroachlabs.com/docs/stable/upgrade-cockroach-version.html). -Note that there are some backward-incompatible changes to SQL features between versions 20.2 and 21.1. For details, see the [CockroachDB v22.2.8 release notes](https://www.cockroachlabs.com/docs/releases/v22.2.8.html#backward-incompatible-changes). +Note that there are some backward-incompatible changes to SQL features between versions 20.2 and 21.1. For details, see the [CockroachDB v22.2.9 release notes](https://www.cockroachlabs.com/docs/releases/v22.2.9.html#backward-incompatible-changes). ## Configuration @@ -316,7 +316,7 @@ For details see the [`values.yaml`](values.yaml) file. | `conf.store.size` | CockroachDB storage size | `""` | | `conf.store.attrs` | CockroachDB storage attributes | `""` | | `image.repository` | Container image name | `cockroachdb/cockroach` | -| `image.tag` | Container image tag | `v22.2.8` | +| `image.tag` | Container image tag | `v22.2.9` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `image.credentials` | `registry`, `user` and `pass` credentials to pull private image | `{}` | | `statefulset.replicas` | StatefulSet replicas number | `3` | diff --git a/charts/cockroach-labs/cockroachdb/values.yaml b/charts/cockroach-labs/cockroachdb/values.yaml index 8eb97e17e..7c89b3b6b 100644 --- a/charts/cockroach-labs/cockroachdb/values.yaml +++ b/charts/cockroach-labs/cockroachdb/values.yaml @@ -1,7 +1,7 @@ # Generated file, DO NOT EDIT. Source: build/templates/values.yaml image: repository: cockroachdb/cockroach - tag: v22.2.8 + tag: v22.2.9 pullPolicy: IfNotPresent credentials: {} # registry: docker.io diff --git a/charts/crate/crate-operator/Chart.lock b/charts/crate/crate-operator/Chart.lock index 57334b8e7..618bf4dc0 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.26.1 -digest: sha256:1e4556dc28bb3a80f17cda2f86631055e1038ea62e4d51f5fb729979593eb78e -generated: "2023-04-12T11:23:24.424038433Z" + version: 2.27.0 +digest: sha256:7637b457386a28389a3830548a790d7b81b48ae41dae2837966cf42ebb10331d +generated: "2023-05-08T13:40:29.306599829Z" diff --git a/charts/crate/crate-operator/Chart.yaml b/charts/crate/crate-operator/Chart.yaml index 9774616ea..2690e4f4a 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.26.1 +appVersion: 2.27.0 dependencies: - condition: crate-operator-crds.enabled name: crate-operator-crds repository: file://./charts/crate-operator-crds - version: 2.26.1 + version: 2.27.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.26.1 +version: 2.27.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 9388caf1f..38567a0bb 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.26.1 +appVersion: 2.27.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.26.1 +version: 2.27.0 diff --git a/charts/f5/nginx-ingress/Chart.yaml b/charts/f5/nginx-ingress/Chart.yaml index 71f9517ba..80698038b 100644 --- a/charts/f5/nginx-ingress/Chart.yaml +++ b/charts/f5/nginx-ingress/Chart.yaml @@ -5,10 +5,10 @@ annotations: catalog.cattle.io/kube-version: '>= 1.22.0-0' catalog.cattle.io/release-name: nginx-ingress apiVersion: v2 -appVersion: 3.1.0 +appVersion: 3.1.1 description: NGINX Ingress Controller home: https://github.com/nginxinc/kubernetes-ingress -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.0/deployments/helm-chart/chart-icon.png +icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.1/deployments/helm-chart/chart-icon.png keywords: - ingress - nginx @@ -18,6 +18,6 @@ maintainers: name: nginxinc name: nginx-ingress sources: -- https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.0/deployments/helm-chart +- https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.1/deployments/helm-chart type: application -version: 0.17.0 +version: 0.17.1 diff --git a/charts/f5/nginx-ingress/README.md b/charts/f5/nginx-ingress/README.md index 56dee8110..15a4ade5d 100644 --- a/charts/f5/nginx-ingress/README.md +++ b/charts/f5/nginx-ingress/README.md @@ -46,52 +46,23 @@ $ kubectl delete -f crds/ > This command will delete all the corresponding custom resources in your cluster across all namespaces. Please ensure there are no custom resources that you want to keep and there are no other Ingress Controller releases running in the cluster. -## Managing the Chart via OCI Registry (edge version) - -> **Warning** -> -> The `edge` version is not intended for production use. It is intended for testing and development purposes only. - +## Managing the Chart via OCI Registry ### Installing the Chart To install the chart with the release name my-release (my-release is the name that you choose): For NGINX: ```console -$ helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.0.0-edge +$ helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.17.1 ``` For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry `myregistry.example.com`) ```console -$ helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.0.0-edge --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true +$ helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.17.1 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true ``` This will install the latest `edge` version of the Ingress Controller from GitHub Container Registry. If you prefer to use Docker Hub, you can replace `ghcr.io/nginxinc/charts/nginx-ingress` with `registry-1.docker.io/nginxcharts/nginx-ingress`. - -## Managing the Chart via Helm Repository - -### Adding the helm repository - -```console -$ helm repo add nginx-stable https://helm.nginx.com/stable -$ helm repo update -``` - -### Installing the Chart - -To install the chart with the release name my-release (my-release is the name that you choose): - -For NGINX: -```console -$ helm install my-release nginx-stable/nginx-ingress -``` - -For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry `myregistry.example.com`) -```console -$ helm install my-release nginx-stable/nginx-ingress --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true -``` - ### Upgrading the Chart Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a release, see [Upgrading the CRDs](#upgrading-the-crds). @@ -99,7 +70,7 @@ Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a re To upgrade the release `my-release`: ```console -$ helm upgrade my-release nginx-stable/nginx-ingress +$ helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.17.1 ``` ### Uninstalling the Chart @@ -113,6 +84,19 @@ The command removes all the Kubernetes components associated with the release an Uninstalling the release does not remove the CRDs. To remove the CRDs, see [Uninstalling the CRDs](#uninstalling-the-crds). +### Edge Version + +To test the latest changes in NGINX Ingress Controller before a new release, you can install the `edge` version. This version is built from the `main` branch of the NGINX Ingress Controller repository. +You can install the `edge` version by specifying the `--version` flag with the value `0.0.0-edge`: + +```console +$ helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.0.0-edge +``` + +> **Warning** +> +> The `edge` version is not intended for production use. It is intended for testing and development purposes only. + ## Managing the Chart via Sources @@ -122,14 +106,15 @@ This step is required if you're installing the chart using its sources. Addition 1. Pull the chart sources: ```console - $ helm pull nginx-stable/nginx-ingress --untar --version 0.16.1 + $ helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 0.17.1 ``` 2. Change your working directory to nginx-ingress: ```console $ cd nginx-ingress ``` -### Installing + +### Installing the Chart To install the chart with the release name my-release (my-release is the name that you choose): @@ -145,14 +130,27 @@ $ helm install my-release -f values-plus.yaml . The command deploys the Ingress Controller in your Kubernetes cluster in the default configuration. The configuration section lists the parameters that can be configured during installation. -When deploying the Ingress Controller, make sure to use your own TLS certificate and key for the default server rather than the default pre-generated ones. Read the [Configuration](#Configuration) section below to see how to configure a TLS certificate and key for the default server. Note that the default server returns the Not Found page with the 404 status code for all requests for domains for which there are no Ingress rules defined. +### Upgrading the Chart -### Upgrading +Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a release, see [Upgrading the CRDs](#upgrading-the-crds). + +To upgrade the release `my-release`: ```console $ helm upgrade my-release . ``` +### Uninstalling the Chart + +To uninstall/delete the release `my-release`: + +```console +$ helm uninstall my-release +``` + +The command removes all the Kubernetes components associated with the release and deletes the release. + +Uninstalling the release does not remove the CRDs. To remove the CRDs, see [Uninstalling the CRDs](#uninstalling-the-crds). ## Running Multiple Ingress Controllers @@ -165,134 +163,134 @@ See [running multiple Ingress Controllers](https://docs.nginx.com/nginx-ingress- The following tables lists the configurable parameters of the NGINX Ingress Controller chart and their default values. -Parameter | Description | Default ---- | --- | --- -`controller.name` | The name of the Ingress Controller daemonset or deployment. | Autogenerated -`controller.kind` | The kind of the Ingress Controller installation - deployment or daemonset. | deployment -`controller.annotations` | Allows for setting of `annotations` for deployment or daemonset. | {} -`controller.nginxplus` | Deploys the Ingress Controller for NGINX Plus. | false -`controller.nginxReloadTimeout` | The timeout in milliseconds which the Ingress Controller will wait for a successful NGINX reload after a change or at the initial start. | 60000 -`controller.hostNetwork` | Enables the Ingress Controller pods to use the host's network namespace. | false -`controller.dnsPolicy` | DNS policy for the Ingress Controller pods. | ClusterFirst -`controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false -`controller.logLevel` | The log level of the Ingress Controller. | 1 -`controller.image.digest ` | The image digest of the Ingress Controller. | None -`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress -`controller.image.tag` | The tag of the Ingress Controller image. | 3.1.0 -`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent -`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} -`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" -`controller.config.name` | The name of the ConfigMap used by the Ingress Controller. | Autogenerated -`controller.config.annotations` | The annotations of the Ingress Controller configmap. | {} -`controller.config.entries` | The entries of the ConfigMap for customizing NGINX configuration. See [ConfigMap resource docs](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) for the list of supported ConfigMap keys. | {} -`controller.customPorts` | A list of custom ports to expose on the NGINX Ingress Controller pod. Follows the conventional Kubernetes yaml syntax for container ports. | [] -`controller.defaultTLS.cert` | The base64-encoded TLS certificate for the default HTTPS server. **Note:** By default, a pre-generated self-signed certificate is used. It is recommended that you specify your own certificate. Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | A pre-generated self-signed certificate. -`controller.defaultTLS.key` | The base64-encoded TLS key for the default HTTPS server. **Note:** By default, a pre-generated key is used. It is recommended that you specify your own key. Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | A pre-generated key. -`controller.defaultTLS.secret` | The secret with a TLS certificate and key for the default HTTPS server. The value must follow the following format: `/`. Used as an alternative to specifying a certificate and key using `controller.defaultTLS.cert` and `controller.defaultTLS.key` parameters. **Note:** Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | None -`controller.wildcardTLS.cert` | The base64-encoded TLS certificate for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None -`controller.wildcardTLS.key` | The base64-encoded TLS key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None -`controller.wildcardTLS.secret` | The secret with a TLS certificate and key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. The value must follow the following format: `/`. Used as an alternative to specifying a certificate and key using `controller.wildcardTLS.cert` and `controller.wildcardTLS.key` parameters. | None -`controller.nodeSelector` | The node selector for pod assignment for the Ingress Controller pods. | {} -`controller.terminationGracePeriodSeconds` | The termination grace period of the Ingress Controller pod. | 30 -`controller.tolerations` | The tolerations of the Ingress Controller pods. | [] -`controller.affinity` | The affinity of the Ingress Controller pods. | {} -`controller.topologySpreadConstraints` | The topology spread constraints of the Ingress controller pods. | {} -`controller.env` | The additional environment variables to be set on the Ingress Controller pods. | [] -`controller.volumes` | The volumes of the Ingress Controller pods. | [] -`controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | [] -`controller.initContainers` | InitContainers for the Ingress Controller pods. | [] -`controller.extraContainers` | Extra (eg. sidecar) containers for the Ingress Controller pods. | [] -`controller.resources` | The resources of the Ingress Controller pods. | requests: cpu=100m,memory=128Mi -`controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1 -`controller.ingressClass` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of kubernetes. | nginx -`controller.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass`. | false -`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | "" -`controller.watchNamespaceLabel` | Configures the Ingress Controller to watch only those namespaces with label foo=bar. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespace`. | "" -`controller.watchSecretNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources of type Secret. If this arg is not configured, the Ingress Controller watches the same namespaces for all resources. See `controller.watchNamespace` and `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchSecretNamespace="default\,nginx-ingress"`. | "" -`controller.enableCustomResources` | Enable the custom resources. | true -`controller.enablePreviewPolicies` | Enable preview policies. This parameter is deprecated. To enable OIDC Policies please use `controller.enableOIDC` instead. | false -`controller.enableOIDC` | Enable OIDC policies. | false -`controller.enableTLSPassthrough` | Enable TLS Passthrough on port 443. Requires `controller.enableCustomResources`. | false -`controller.enableCertManager` | Enable x509 automated certificate management for VirtualServer resources using cert-manager (cert-manager.io). Requires `controller.enableCustomResources`. | false -`controller.enableExternalDNS` | Enable integration with ExternalDNS for configuring public DNS entries for VirtualServer resources using [ExternalDNS](https://github.com/kubernetes-sigs/external-dns). Requires `controller.enableCustomResources`. | false -`controller.globalConfiguration.create` | Creates the GlobalConfiguration custom resource. Requires `controller.enableCustomResources`. | false -`controller.globalConfiguration.spec` | The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller. | {} -`controller.enableSnippets` | Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources. | false -`controller.healthStatus` | Add a location "/nginx-health" to the default server. The location responds with the 200 status code for any request. Useful for external health-checking of the Ingress Controller. | false -`controller.healthStatusURI` | Sets the URI of health status location in the default server. Requires `controller.healthStatus`. | "/nginx-health" -`controller.nginxStatus.enable` | Enable the NGINX stub_status, or the NGINX Plus API. | true -`controller.nginxStatus.port` | Set the port where the NGINX stub_status or the NGINX Plus API is exposed. | 8080 -`controller.nginxStatus.allowCidrs` | Add IP/CIDR blocks to the allow list for NGINX stub_status or the NGINX Plus API. Separate multiple IP/CIDR by commas. | 127.0.0.1,::1 -`controller.priorityClassName` | The PriorityClass of the Ingress Controller pods. | None -`controller.service.create` | Creates a service to expose the Ingress Controller pods. | true -`controller.service.type` | The type of service to create for the Ingress Controller. | LoadBalancer -`controller.service.externalTrafficPolicy` | The externalTrafficPolicy of the service. The value Local preserves the client source IP. | Local -`controller.service.annotations` | The annotations of the Ingress Controller service. | {} -`controller.service.extraLabels` | The extra labels of the service. | {} -`controller.service.loadBalancerIP` | The static IP address for the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | "" -`controller.service.externalIPs` | The list of external IPs for the Ingress Controller service. | [] -`controller.service.loadBalancerSourceRanges` | The IP ranges (CIDR) that are allowed to access the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | [] -`controller.service.name` | The name of the service. | Autogenerated -`controller.service.customPorts` | A list of custom ports to expose through the Ingress Controller service. Follows the conventional Kubernetes yaml syntax for service ports. | [] -`controller.service.httpPort.enable` | Enables the HTTP port for the Ingress Controller service. | true -`controller.service.httpPort.port` | The HTTP port of the Ingress Controller service. | 80 -`controller.service.httpPort.nodePort` | The custom NodePort for the HTTP port. Requires `controller.service.type` set to `NodePort`. | "" -`controller.service.httpPort.targetPort` | The target port of the HTTP port of the Ingress Controller service. | 80 -`controller.service.httpsPort.enable` | Enables the HTTPS port for the Ingress Controller service. | true -`controller.service.httpsPort.port` | The HTTPS port of the Ingress Controller service. | 443 -`controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | "" -`controller.service.httpsPort.targetPort` | The target port of the HTTPS port of the Ingress Controller service. | 443 -`controller.serviceAccount.annotations` | The annotations of the Ingress Controller service account. | {} -`controller.serviceAccount.name` | The name of the service account of the Ingress Controller pods. Used for RBAC. | Autogenerated -`controller.serviceAccount.imagePullSecretName` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. | "" -`controller.serviceMonitor.name` | The name of the serviceMonitor. | Autogenerated -`controller.serviceMonitor.create` | Create a ServiceMonitor custom resource. | false -`controller.serviceMonitor.labels` | Kubernetes object labels to attach to the serviceMonitor object. | "" -`controller.serviceMonitor.selectorMatchLabels` | A set of labels to allow the selection of endpoints for the ServiceMonitor. | "" -`controller.serviceMonitor.endpoints` | A list of endpoints allowed as part of this ServiceMonitor. | "" -`controller.reportIngressStatus.enable` | Updates the address field in the status of Ingress resources with an external address of the Ingress Controller. You must also specify the source of the external address either through an external service via `controller.reportIngressStatus.externalService`, `controller.reportIngressStatus.ingressLink` or the `external-status-address` entry in the ConfigMap via `controller.config.entries`. **Note:** `controller.config.entries.external-status-address` takes precedence over the others. | true -`controller.reportIngressStatus.externalService` | Specifies the name of the service with the type LoadBalancer through which the Ingress Controller is exposed externally. The external address of the service is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute resources. `controller.reportIngressStatus.enable` must be set to `true`. The default is autogenerated and enabled when `controller.service.create` is set to `true` and `controller.service.type` is set to `LoadBalancer`. | Autogenerated -`controller.reportIngressStatus.ingressLink` | Specifies the name of the IngressLink resource, which exposes the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute resources. `controller.reportIngressStatus.enable` must be set to `true`. | "" -`controller.reportIngressStatus.enableLeaderElection` | Enable Leader election to avoid multiple replicas of the controller reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. | true -`controller.reportIngressStatus.leaderElectionLockName` | Specifies the name of the ConfigMap, within the same namespace as the controller, used as the lock for leader election. controller.reportIngressStatus.enableLeaderElection must be set to true. | Autogenerated -`controller.reportIngressStatus.annotations` | The annotations of the leader election configmap. | {} -`controller.pod.annotations` | The annotations of the Ingress Controller pod. | {} -`controller.pod.extraLabels` | The additional extra labels of the Ingress Controller pod. | {} -`controller.appprotect.enable` | Enables the App Protect WAF module in the Ingress Controller. | false -`controller.appprotectdos.enable` | Enables the App Protect DoS module in the Ingress Controller. | false -`controller.appprotectdos.debug` | Enable debugging for App Protect DoS. | false -`controller.appprotectdos.maxDaemons` | Max number of ADMD instances. | 1 -`controller.appprotectdos.maxWorkers` | Max number of nginx processes to support. | Number of CPU cores in the machine -`controller.appprotectdos.memory` | RAM memory size to consume in MB. | 50% of free RAM in the container or 80MB, the smaller -`controller.readyStatus.enable` | Enables the readiness endpoint `"/nginx-ready"`. The endpoint returns a success code when NGINX has loaded all the config after the startup. This also configures a readiness probe for the Ingress Controller pods that uses the readiness endpoint. | true -`controller.readyStatus.port` | The HTTP port for the readiness endpoint. | 8081 -`controller.readyStatus.initialDelaySeconds` | The number of seconds after the Ingress Controller pod has started before readiness probes are initiated. | 0 -`controller.enableLatencyMetrics` | Enable collection of latency metrics for upstreams. Requires `prometheus.create`. | false -`controller.minReadySeconds` | Specifies the minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing, for it to be considered available. [docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds) | 0 -`controller.autoscaling.enabled` | Enables HorizontalPodAutoscaling. | false -`controller.autoscaling.annotations` | The annotations of the Ingress Controller HorizontalPodAutoscaler. | {} -`controller.autoscaling.minReplicas` | Minimum number of replicas for the HPA. | 1 -`controller.autoscaling.maxReplicas` | Maximum number of replicas for the HPA. | 3 -`controller.autoscaling.targetCPUUtilizationPercentage` | The target CPU utilization percentage. | 50 -`controller.autoscaling.targetMemoryUtilizationPercentage` | The target memory utilization percentage. | 50 -`controller.podDisruptionBudget.enabled` | Enables PodDisruptionBudget. | false -`controller.podDisruptionBudget.annotations` | The annotations of the Ingress Controller pod disruption budget | {} -`controller.podDisruptionBudget.minAvailable` | The number of Ingress Controller pods that should be available. This is a mutually exclusive setting with "maxUnavailable". | 0 -`controller.podDisruptionBudget.maxUnavailable` | The number of Ingress Controller pods that can be unavailable. This is a mutually exclusive setting with "minAvailable". | 0 -`controller.strategy` | Specifies the strategy used to replace old Pods with new ones. Docs for [Deployment update strategy](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy) and [Daemonset update strategy](https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/#daemonset-update-strategy) | {} -`controller.disableIPV6` | Disable IPV6 listeners explicitly for nodes that do not support the IPV6 stack. | false -`controller.readOnlyRootFilesystem` | Configure root filesystem as read-only and add volumes for temporary data. | false -`rbac.create` | Configures RBAC. | true -`prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | true -`prometheus.port` | Configures the port to scrape the metrics. | 9113 -`prometheus.scheme` | Configures the HTTP scheme to use for connections to the Prometheus endpoint. | http -`prometheus.secret` | The namespace / name of a Kubernetes TLS Secret. If specified, this secret is used to secure the Prometheus endpoint with TLS connections. | "" -`serviceInsight.create` | Expose NGINX Plus Service Insight endpoint. | false -`serviceInsight.port` | Configures the port to expose endpoints. | 9114 -`serviceInsight.scheme` | Configures the HTTP scheme to use for connections to the Service Insight endpoint. | http -`serviceInsight.secret` | The namespace / name of a Kubernetes TLS Secret. If specified, this secret is used to secure the Service Insight endpoint with TLS connections. | "" -`nginxServiceMesh.enable` | Enable integration with NGINX Service Mesh. See the NGINX Service Mesh [docs](https://docs.nginx.com/nginx-service-mesh/tutorials/kic/deploy-with-kic/) for more details. Requires `controller.nginxplus`. | false -`nginxServiceMesh.enableEgress` | Enable NGINX Service Mesh workloads to route egress traffic through the Ingress Controller. See the NGINX Service Mesh [docs](https://docs.nginx.com/nginx-service-mesh/tutorials/kic/deploy-with-kic/#enabling-egress) for more details. Requires `nginxServiceMesh.enable`. | false +|Parameter | Description | Default | +| --- | --- | --- | +|`controller.name` | The name of the Ingress Controller daemonset or deployment. | Autogenerated | +|`controller.kind` | The kind of the Ingress Controller installation - deployment or daemonset. | deployment | +|`controller.annotations` | Allows for setting of `annotations` for deployment or daemonset. | {} | +|`controller.nginxplus` | Deploys the Ingress Controller for NGINX Plus. | false | +|`controller.nginxReloadTimeout` | The timeout in milliseconds which the Ingress Controller will wait for a successful NGINX reload after a change or at the initial start. | 60000 | +|`controller.hostNetwork` | Enables the Ingress Controller pods to use the host's network namespace. | false | +|`controller.dnsPolicy` | DNS policy for the Ingress Controller pods. | ClusterFirst | +|`controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false | +|`controller.logLevel` | The log level of the Ingress Controller. | 1 | +|`controller.image.digest ` | The image digest of the Ingress Controller. | None | +|`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress | +|`controller.image.tag` | The tag of the Ingress Controller image. | 3.1.1 | +|`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent | +|`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} | +|`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" | +|`controller.config.name` | The name of the ConfigMap used by the Ingress Controller. | Autogenerated | +|`controller.config.annotations` | The annotations of the Ingress Controller configmap. | {} | +|`controller.config.entries` | The entries of the ConfigMap for customizing NGINX configuration. See [ConfigMap resource docs](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) for the list of supported ConfigMap keys. | {} | +|`controller.customPorts` | A list of custom ports to expose on the NGINX Ingress Controller pod. Follows the conventional Kubernetes yaml syntax for container ports. | [] | +|`controller.defaultTLS.cert` | The base64-encoded TLS certificate for the default HTTPS server. **Note:** By default, a pre-generated self-signed certificate is used. It is recommended that you specify your own certificate. Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | A pre-generated self-signed certificate. | +|`controller.defaultTLS.key` | The base64-encoded TLS key for the default HTTPS server. **Note:** By default, a pre-generated key is used. It is recommended that you specify your own key. Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | A pre-generated key. | +|`controller.defaultTLS.secret` | The secret with a TLS certificate and key for the default HTTPS server. The value must follow the following format: `/`. Used as an alternative to specifying a certificate and key using `controller.defaultTLS.cert` and `controller.defaultTLS.key` parameters. **Note:** Alternatively, omitting the default server secret completely will configure NGINX to reject TLS connections to the default server. | None | +|`controller.wildcardTLS.cert` | The base64-encoded TLS certificate for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None | +|`controller.wildcardTLS.key` | The base64-encoded TLS key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None | +|`controller.wildcardTLS.secret` | The secret with a TLS certificate and key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. The value must follow the following format: `/`. Used as an alternative to specifying a certificate and key using `controller.wildcardTLS.cert` and `controller.wildcardTLS.key` parameters. | None | +|`controller.nodeSelector` | The node selector for pod assignment for the Ingress Controller pods. | {} | +|`controller.terminationGracePeriodSeconds` | The termination grace period of the Ingress Controller pod. | 30 | +|`controller.tolerations` | The tolerations of the Ingress Controller pods. | [] | +|`controller.affinity` | The affinity of the Ingress Controller pods. | {} | +|`controller.topologySpreadConstraints` | The topology spread constraints of the Ingress controller pods. | {} | +|`controller.env` | The additional environment variables to be set on the Ingress Controller pods. | [] | +|`controller.volumes` | The volumes of the Ingress Controller pods. | [] | +|`controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | [] | +|`controller.initContainers` | InitContainers for the Ingress Controller pods. | [] | +|`controller.extraContainers` | Extra (eg. sidecar) containers for the Ingress Controller pods. | [] | +|`controller.resources` | The resources of the Ingress Controller pods. | requests: cpu=100m,memory=128Mi | +|`controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1 | +|`controller.ingressClass` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of kubernetes. | nginx | +|`controller.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass`. | false | +|`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | "" | +|`controller.watchNamespaceLabel` | Configures the Ingress Controller to watch only those namespaces with label foo=bar. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespace`. | "" | +|`controller.watchSecretNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources of type Secret. If this arg is not configured, the Ingress Controller watches the same namespaces for all resources. See `controller.watchNamespace` and `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchSecretNamespace="default\,nginx-ingress"`. | "" | +|`controller.enableCustomResources` | Enable the custom resources. | true | +|`controller.enablePreviewPolicies` | Enable preview policies. This parameter is deprecated. To enable OIDC Policies please use `controller.enableOIDC` instead. | false | +|`controller.enableOIDC` | Enable OIDC policies. | false | +|`controller.enableTLSPassthrough` | Enable TLS Passthrough on port 443. Requires `controller.enableCustomResources`. | false | +|`controller.enableCertManager` | Enable x509 automated certificate management for VirtualServer resources using cert-manager (cert-manager.io). Requires `controller.enableCustomResources`. | false | +|`controller.enableExternalDNS` | Enable integration with ExternalDNS for configuring public DNS entries for VirtualServer resources using [ExternalDNS](https://github.com/kubernetes-sigs/external-dns). Requires `controller.enableCustomResources`. | false | +|`controller.globalConfiguration.create` | Creates the GlobalConfiguration custom resource. Requires `controller.enableCustomResources`. | false | +|`controller.globalConfiguration.spec` | The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller. | {} | +|`controller.enableSnippets` | Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources. | false | +|`controller.healthStatus` | Add a location "/nginx-health" to the default server. The location responds with the 200 status code for any request. Useful for external health-checking of the Ingress Controller. | false | +|`controller.healthStatusURI` | Sets the URI of health status location in the default server. Requires `controller.healthStatus`. | "/nginx-health" | +|`controller.nginxStatus.enable` | Enable the NGINX stub_status, or the NGINX Plus API. | true | +|`controller.nginxStatus.port` | Set the port where the NGINX stub_status or the NGINX Plus API is exposed. | 8080 | +|`controller.nginxStatus.allowCidrs` | Add IP/CIDR blocks to the allow list for NGINX stub_status or the NGINX Plus API. Separate multiple IP/CIDR by commas. | 127.0.0.1,::1 | +|`controller.priorityClassName` | The PriorityClass of the Ingress Controller pods. | None | +|`controller.service.create` | Creates a service to expose the Ingress Controller pods. | true | +|`controller.service.type` | The type of service to create for the Ingress Controller. | LoadBalancer | +|`controller.service.externalTrafficPolicy` | The externalTrafficPolicy of the service. The value Local preserves the client source IP. | Local | +|`controller.service.annotations` | The annotations of the Ingress Controller service. | {} | +|`controller.service.extraLabels` | The extra labels of the service. | {} | +|`controller.service.loadBalancerIP` | The static IP address for the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | "" | +|`controller.service.externalIPs` | The list of external IPs for the Ingress Controller service. | [] | +|`controller.service.loadBalancerSourceRanges` | The IP ranges (CIDR) that are allowed to access the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | [] | +|`controller.service.name` | The name of the service. | Autogenerated | +|`controller.service.customPorts` | A list of custom ports to expose through the Ingress Controller service. Follows the conventional Kubernetes yaml syntax for service ports. | [] | +|`controller.service.httpPort.enable` | Enables the HTTP port for the Ingress Controller service. | true | +|`controller.service.httpPort.port` | The HTTP port of the Ingress Controller service. | 80 | +|`controller.service.httpPort.nodePort` | The custom NodePort for the HTTP port. Requires `controller.service.type` set to `NodePort`. | "" | +|`controller.service.httpPort.targetPort` | The target port of the HTTP port of the Ingress Controller service. | 80 | +|`controller.service.httpsPort.enable` | Enables the HTTPS port for the Ingress Controller service. | true | +|`controller.service.httpsPort.port` | The HTTPS port of the Ingress Controller service. | 443 | +|`controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | "" | +|`controller.service.httpsPort.targetPort` | The target port of the HTTPS port of the Ingress Controller service. | 443 | +|`controller.serviceAccount.annotations` | The annotations of the Ingress Controller service account. | {} | +|`controller.serviceAccount.name` | The name of the service account of the Ingress Controller pods. Used for RBAC. | Autogenerated | +|`controller.serviceAccount.imagePullSecretName` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. | "" | +|`controller.serviceMonitor.name` | The name of the serviceMonitor. | Autogenerated | +|`controller.serviceMonitor.create` | Create a ServiceMonitor custom resource. | false | +|`controller.serviceMonitor.labels` | Kubernetes object labels to attach to the serviceMonitor object. | "" | +|`controller.serviceMonitor.selectorMatchLabels` | A set of labels to allow the selection of endpoints for the ServiceMonitor. | "" | +|`controller.serviceMonitor.endpoints` | A list of endpoints allowed as part of this ServiceMonitor. | "" | +|`controller.reportIngressStatus.enable` | Updates the address field in the status of Ingress resources with an external address of the Ingress Controller. You must also specify the source of the external address either through an external service via `controller.reportIngressStatus.externalService`, `controller.reportIngressStatus.ingressLink` or the `external-status-address` entry in the ConfigMap via `controller.config.entries`. **Note:** `controller.config.entries.external-status-address` takes precedence over the others. | true | +|`controller.reportIngressStatus.externalService` | Specifies the name of the service with the type LoadBalancer through which the Ingress Controller is exposed externally. The external address of the service is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute resources. `controller.reportIngressStatus.enable` must be set to `true`. The default is autogenerated and enabled when `controller.service.create` is set to `true` and `controller.service.type` is set to `LoadBalancer`. | Autogenerated | +|`controller.reportIngressStatus.ingressLink` | Specifies the name of the IngressLink resource, which exposes the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute resources. `controller.reportIngressStatus.enable` must be set to `true`. | "" | +|`controller.reportIngressStatus.enableLeaderElection` | Enable Leader election to avoid multiple replicas of the controller reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. | true | +|`controller.reportIngressStatus.leaderElectionLockName` | Specifies the name of the ConfigMap, within the same namespace as the controller, used as the lock for leader election. controller.reportIngressStatus.enableLeaderElection must be set to true. | Autogenerated | +|`controller.reportIngressStatus.annotations` | The annotations of the leader election configmap. | {} | +|`controller.pod.annotations` | The annotations of the Ingress Controller pod. | {} | +|`controller.pod.extraLabels` | The additional extra labels of the Ingress Controller pod. | {} | +|`controller.appprotect.enable` | Enables the App Protect WAF module in the Ingress Controller. | false | +|`controller.appprotectdos.enable` | Enables the App Protect DoS module in the Ingress Controller. | false | +|`controller.appprotectdos.debug` | Enable debugging for App Protect DoS. | false | +|`controller.appprotectdos.maxDaemons` | Max number of ADMD instances. | 1 | +|`controller.appprotectdos.maxWorkers` | Max number of nginx processes to support. | Number of CPU cores in the machine | +|`controller.appprotectdos.memory` | RAM memory size to consume in MB. | 50% of free RAM in the container or 80MB, the smaller | +|`controller.readyStatus.enable` | Enables the readiness endpoint `"/nginx-ready"`. The endpoint returns a success code when NGINX has loaded all the config after the startup. This also configures a readiness probe for the Ingress Controller pods that uses the readiness endpoint. | true | +|`controller.readyStatus.port` | The HTTP port for the readiness endpoint. | 8081 | +|`controller.readyStatus.initialDelaySeconds` | The number of seconds after the Ingress Controller pod has started before readiness probes are initiated. | 0 | +|`controller.enableLatencyMetrics` | Enable collection of latency metrics for upstreams. Requires `prometheus.create`. | false | +|`controller.minReadySeconds` | Specifies the minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing, for it to be considered available. [docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds) | 0 | +|`controller.autoscaling.enabled` | Enables HorizontalPodAutoscaling. | false | +|`controller.autoscaling.annotations` | The annotations of the Ingress Controller HorizontalPodAutoscaler. | {} | +|`controller.autoscaling.minReplicas` | Minimum number of replicas for the HPA. | 1 | +|`controller.autoscaling.maxReplicas` | Maximum number of replicas for the HPA. | 3 | +|`controller.autoscaling.targetCPUUtilizationPercentage` | The target CPU utilization percentage. | 50 | +|`controller.autoscaling.targetMemoryUtilizationPercentage` | The target memory utilization percentage. | 50 | +|`controller.podDisruptionBudget.enabled` | Enables PodDisruptionBudget. | false | +|`controller.podDisruptionBudget.annotations` | The annotations of the Ingress Controller pod disruption budget | {} | +|`controller.podDisruptionBudget.minAvailable` | The number of Ingress Controller pods that should be available. This is a mutually exclusive setting with "maxUnavailable". | 0 | +|`controller.podDisruptionBudget.maxUnavailable` | The number of Ingress Controller pods that can be unavailable. This is a mutually exclusive setting with "minAvailable". | 0 | +|`controller.strategy` | Specifies the strategy used to replace old Pods with new ones. Docs for [Deployment update strategy](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy) and [Daemonset update strategy](https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/#daemonset-update-strategy) | {} | +|`controller.disableIPV6` | Disable IPV6 listeners explicitly for nodes that do not support the IPV6 stack. | false | +|`controller.readOnlyRootFilesystem` | Configure root filesystem as read-only and add volumes for temporary data. | false | +|`rbac.create` | Configures RBAC. | true | +|`prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | true | +|`prometheus.port` | Configures the port to scrape the metrics. | 9113 | +|`prometheus.scheme` | Configures the HTTP scheme to use for connections to the Prometheus endpoint. | http | +|`prometheus.secret` | The namespace / name of a Kubernetes TLS Secret. If specified, this secret is used to secure the Prometheus endpoint with TLS connections. | "" | +|`serviceInsight.create` | Expose NGINX Plus Service Insight endpoint. | false | +|`serviceInsight.port` | Configures the port to expose endpoints. | 9114 | +|`serviceInsight.scheme` | Configures the HTTP scheme to use for connections to the Service Insight endpoint. | http | +|`serviceInsight.secret` | The namespace / name of a Kubernetes TLS Secret. If specified, this secret is used to secure the Service Insight endpoint with TLS connections. | "" | +|`nginxServiceMesh.enable` | Enable integration with NGINX Service Mesh. See the NGINX Service Mesh [docs](https://docs.nginx.com/nginx-service-mesh/tutorials/kic/deploy-with-kic/) for more details. Requires `controller.nginxplus`. | false | +|`nginxServiceMesh.enableEgress` | Enable NGINX Service Mesh workloads to route egress traffic through the Ingress Controller. See the NGINX Service Mesh [docs](https://docs.nginx.com/nginx-service-mesh/tutorials/kic/deploy-with-kic/#enabling-egress) for more details. Requires `nginxServiceMesh.enable`. | false | ## Notes * The values-icp.yaml file is used for deploying the Ingress Controller on IBM Cloud Private. See the [blog post](https://www.nginx.com/blog/nginx-ingress-controller-ibm-cloud-private/) for more details. diff --git a/charts/f5/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml b/charts/f5/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml index 5d5c8068c..b6dffb3f4 100644 --- a/charts/f5/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml +++ b/charts/f5/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: dosprotectedresources.appprotectdos.f5.com spec: group: appprotectdos.f5.com diff --git a/charts/f5/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml b/charts/f5/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml index ab529a2be..e48f4a5e3 100644 --- a/charts/f5/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml +++ b/charts/f5/nginx-ingress/crds/externaldns.nginx.org_dnsendpoints.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: dnsendpoints.externaldns.nginx.org spec: group: externaldns.nginx.org diff --git a/charts/f5/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml b/charts/f5/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml index 5796766cc..317716911 100644 --- a/charts/f5/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml +++ b/charts/f5/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: globalconfigurations.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/charts/f5/nginx-ingress/crds/k8s.nginx.org_policies.yaml b/charts/f5/nginx-ingress/crds/k8s.nginx.org_policies.yaml index 25b15f270..39c780f17 100644 --- a/charts/f5/nginx-ingress/crds/k8s.nginx.org_policies.yaml +++ b/charts/f5/nginx-ingress/crds/k8s.nginx.org_policies.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: policies.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/charts/f5/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml b/charts/f5/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml index 4e3b25b30..3608e27b7 100644 --- a/charts/f5/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml +++ b/charts/f5/nginx-ingress/crds/k8s.nginx.org_transportservers.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: transportservers.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml b/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml index 4a4e0862a..22048b907 100644 --- a/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml +++ b/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualserverroutes.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: virtualserverroutes.k8s.nginx.org spec: group: k8s.nginx.org diff --git a/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml b/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml index b6fe476ea..968573fae 100644 --- a/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml +++ b/charts/f5/nginx-ingress/crds/k8s.nginx.org_virtualservers.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.11.4 name: virtualservers.k8s.nginx.org spec: group: k8s.nginx.org @@ -93,6 +92,9 @@ spec: type: string ingressClassName: type: string + internalRoute: + description: InternalRoute allows for the configuration of internal routing. + type: boolean policies: type: array items: diff --git a/charts/f5/nginx-ingress/templates/controller-daemonset.yaml b/charts/f5/nginx-ingress/templates/controller-daemonset.yaml index 5d69a9364..0b8c0d098 100644 --- a/charts/f5/nginx-ingress/templates/controller-daemonset.yaml +++ b/charts/f5/nginx-ingress/templates/controller-daemonset.yaml @@ -18,23 +18,20 @@ spec: labels: {{- include "nginx-ingress.selectorLabels" . | nindent 8 }} {{- if .Values.nginxServiceMesh.enable }} + nsm.nginx.com/enable-ingress: "true" + nsm.nginx.com/enable-egress: "{{ .Values.nginxServiceMesh.enableEgress }}" nsm.nginx.com/daemonset: {{ include "nginx-ingress.controller.fullname" . }} - spiffe.io/spiffeid: "true" {{- end }} {{- if .Values.controller.pod.extraLabels }} {{ toYaml .Values.controller.pod.extraLabels | indent 8 }} {{- end }} -{{- if or .Values.prometheus.create (or .Values.controller.pod.annotations .Values.nginxServiceMesh.enable) }} +{{- if or .Values.prometheus.create .Values.controller.pod.annotations }} annotations: {{- if .Values.prometheus.create }} prometheus.io/scrape: "true" prometheus.io/port: "{{ .Values.prometheus.port }}" prometheus.io/scheme: "{{ .Values.prometheus.scheme }}" {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - nsm.nginx.com/enable-ingress: "true" - nsm.nginx.com/enable-egress: "{{ .Values.nginxServiceMesh.enableEgress }}" -{{- end }} {{- if .Values.controller.pod.annotations }} {{ toYaml .Values.controller.pod.annotations | indent 8 }} {{- end }} @@ -48,9 +45,6 @@ spec: {{- if .Values.controller.readOnlyRootFilesystem }} fsGroup: 101 #nginx {{- end }} - sysctls: - - name: "net.ipv4.ip_unprivileged_port_start" - value: "0" terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }} {{- if .Values.controller.nodeSelector }} nodeSelector: @@ -64,7 +58,7 @@ spec: affinity: {{ toYaml .Values.controller.affinity | indent 8 }} {{- end }} -{{- if or .Values.controller.readOnlyRootFilesystem .Values.nginxServiceMesh.enable .Values.controller.volumes }} +{{- if or .Values.controller.readOnlyRootFilesystem .Values.controller.volumes }} volumes: {{- end }} {{- if .Values.controller.readOnlyRootFilesystem }} @@ -77,12 +71,6 @@ spec: - name: nginx-log emptyDir: {} {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - - hostPath: - path: /run/spire/sockets - type: DirectoryOrCreate - name: spire-agent-socket -{{- end }} {{- if .Values.controller.volumes }} {{ toYaml .Values.controller.volumes | indent 6 }} {{- end }} @@ -135,7 +123,9 @@ spec: capabilities: drop: - ALL -{{- if or .Values.controller.readOnlyRootFilesystem .Values.nginxServiceMesh.enable .Values.controller.volumeMounts }} + add: + - NET_BIND_SERVICE +{{- if or .Values.controller.readOnlyRootFilesystem .Values.controller.volumeMounts }} volumeMounts: {{- end }} {{- if .Values.controller.readOnlyRootFilesystem }} @@ -148,10 +138,6 @@ spec: - mountPath: /var/log/nginx name: nginx-log {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - - mountPath: /run/spire/sockets - name: spire-agent-socket -{{- end }} {{- if .Values.controller.volumeMounts }} {{ toYaml .Values.controller.volumeMounts | indent 8 }} {{- end }} @@ -225,9 +211,9 @@ spec: {{- end }} {{- end }} - -enable-leader-election={{ .Values.controller.reportIngressStatus.enableLeaderElection }} - {{- if .Values.controller.reportIngressStatus.enableLeaderElection }} +{{- if .Values.controller.reportIngressStatus.enableLeaderElection }} - -leader-election-lock-name={{ include "nginx-ingress.leaderElectionName" . }} - {{- end }} +{{- end }} {{- if .Values.controller.wildcardTLS.secret }} - -wildcard-tls-secret={{ .Values.controller.wildcardTLS.secret }} {{- else if and .Values.controller.wildcardTLS.cert .Values.controller.wildcardTLS.key }} @@ -250,16 +236,12 @@ spec: - -enable-oidc={{ .Values.controller.enableOIDC }} - -enable-external-dns={{ .Values.controller.enableExternalDNS }} {{- if .Values.controller.globalConfiguration.create }} - - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.name" . }} + - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }} {{- end }} {{- end }} - -ready-status={{ .Values.controller.readyStatus.enable }} - -ready-status-port={{ .Values.controller.readyStatus.port }} - -enable-latency-metrics={{ .Values.controller.enableLatencyMetrics }} -{{- if .Values.nginxServiceMesh.enable }} - - -spire-agent-address=/run/spire/sockets/agent.sock - - -enable-internal-routes={{ .Values.nginxServiceMesh.enableEgress }} -{{- end }} {{- if .Values.controller.extraContainers }} {{ toYaml .Values.controller.extraContainers | nindent 6 }} {{- end }} diff --git a/charts/f5/nginx-ingress/templates/controller-deployment.yaml b/charts/f5/nginx-ingress/templates/controller-deployment.yaml index e6c182dc4..97d3b49c4 100644 --- a/charts/f5/nginx-ingress/templates/controller-deployment.yaml +++ b/charts/f5/nginx-ingress/templates/controller-deployment.yaml @@ -10,7 +10,9 @@ metadata: annotations: {{ toYaml .Values.controller.annotations | nindent 4 }} {{- end }} spec: + {{- if not .Values.controller.autoscaling.enabled }} replicas: {{ .Values.controller.replicaCount }} + {{- end }} selector: matchLabels: {{- include "nginx-ingress.selectorLabels" . | nindent 6 }} @@ -19,23 +21,20 @@ spec: labels: {{- include "nginx-ingress.selectorLabels" . | nindent 8 }} {{- if .Values.nginxServiceMesh.enable }} + nsm.nginx.com/enable-ingress: "true" + nsm.nginx.com/enable-egress: "{{ .Values.nginxServiceMesh.enableEgress }}" nsm.nginx.com/deployment: {{ include "nginx-ingress.controller.fullname" . }} - spiffe.io/spiffeid: "true" {{- end }} {{- if .Values.controller.pod.extraLabels }} {{ toYaml .Values.controller.pod.extraLabels | indent 8 }} {{- end }} -{{- if or .Values.prometheus.create (or .Values.controller.pod.annotations .Values.nginxServiceMesh.enable) }} +{{- if or .Values.prometheus.create .Values.controller.pod.annotations }} annotations: {{- if .Values.prometheus.create }} prometheus.io/scrape: "true" prometheus.io/port: "{{ .Values.prometheus.port }}" prometheus.io/scheme: "{{ .Values.prometheus.scheme }}" {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - nsm.nginx.com/enable-ingress: "true" - nsm.nginx.com/enable-egress: "{{ .Values.nginxServiceMesh.enableEgress }}" -{{- end }} {{- if .Values.controller.pod.annotations }} {{ toYaml .Values.controller.pod.annotations | indent 8 }} {{- end }} @@ -57,7 +56,7 @@ spec: topologySpreadConstraints: {{ toYaml .Values.controller.topologySpreadConstraints | indent 8 }} {{- end }} -{{- if or .Values.controller.readOnlyRootFilesystem .Values.nginxServiceMesh.enable .Values.controller.volumes }} +{{- if or .Values.controller.readOnlyRootFilesystem .Values.controller.volumes }} volumes: {{- end }} {{- if .Values.controller.readOnlyRootFilesystem }} @@ -70,12 +69,6 @@ spec: - name: nginx-log emptyDir: {} {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - - hostPath: - path: /run/spire/sockets - type: DirectoryOrCreate - name: spire-agent-socket -{{- end }} {{- if .Values.controller.volumes }} {{ toYaml .Values.controller.volumes | indent 6 }} {{- end }} @@ -90,9 +83,6 @@ spec: {{- if .Values.controller.readOnlyRootFilesystem }} fsGroup: 101 #nginx {{- end }} - sysctls: - - name: "net.ipv4.ip_unprivileged_port_start" - value: "0" terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }} hostNetwork: {{ .Values.controller.hostNetwork }} dnsPolicy: {{ .Values.controller.dnsPolicy }} @@ -140,7 +130,9 @@ spec: capabilities: drop: - ALL -{{- if or .Values.controller.readOnlyRootFilesystem .Values.nginxServiceMesh.enable .Values.controller.volumeMounts }} + add: + - NET_BIND_SERVICE +{{- if or .Values.controller.readOnlyRootFilesystem .Values.controller.volumeMounts }} volumeMounts: {{- end }} {{- if .Values.controller.readOnlyRootFilesystem }} @@ -153,10 +145,6 @@ spec: - mountPath: /var/log/nginx name: nginx-log {{- end }} -{{- if .Values.nginxServiceMesh.enable }} - - mountPath: /run/spire/sockets - name: spire-agent-socket -{{- end }} {{- if .Values.controller.volumeMounts}} {{ toYaml .Values.controller.volumeMounts | indent 8 }} {{- end }} @@ -253,16 +241,12 @@ spec: - -enable-oidc={{ .Values.controller.enableOIDC }} - -enable-external-dns={{ .Values.controller.enableExternalDNS }} {{- if .Values.controller.globalConfiguration.create }} - - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.name" . }} + - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }} {{- end }} {{- end }} - -ready-status={{ .Values.controller.readyStatus.enable }} - -ready-status-port={{ .Values.controller.readyStatus.port }} - -enable-latency-metrics={{ .Values.controller.enableLatencyMetrics }} -{{- if .Values.nginxServiceMesh.enable }} - - -spire-agent-address=/run/spire/sockets/agent.sock - - -enable-internal-routes={{ .Values.nginxServiceMesh.enableEgress }} -{{- end }} {{- if .Values.controller.extraContainers }} {{ toYaml .Values.controller.extraContainers | nindent 6 }} {{- end }} diff --git a/charts/f5/nginx-ingress/templates/controller-globalconfiguration.yaml b/charts/f5/nginx-ingress/templates/controller-globalconfiguration.yaml index a9231b097..9039ab044 100644 --- a/charts/f5/nginx-ingress/templates/controller-globalconfiguration.yaml +++ b/charts/f5/nginx-ingress/templates/controller-globalconfiguration.yaml @@ -2,7 +2,7 @@ apiVersion: k8s.nginx.org/v1alpha1 kind: GlobalConfiguration metadata: - name: {{ include "nginx-ingress.fullname" . }} + name: {{ include "nginx-ingress.controller.fullname" . }} namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} diff --git a/charts/f5/nginx-ingress/templates/controller-hpa.yaml b/charts/f5/nginx-ingress/templates/controller-hpa.yaml index 6bfe1d9d4..bc7146390 100644 --- a/charts/f5/nginx-ingress/templates/controller-hpa.yaml +++ b/charts/f5/nginx-ingress/templates/controller-hpa.yaml @@ -18,14 +18,6 @@ spec: minReplicas: {{ .Values.controller.autoscaling.minReplicas }} maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }} metrics: - {{- if .Values.controller.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.controller.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} {{- if .Values.controller.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: @@ -34,4 +26,12 @@ spec: type: Utilization averageUtilization: {{ .Values.controller.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} + {{- if .Values.controller.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.controller.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/charts/f5/nginx-ingress/templates/controller-leader-election-configmap.yaml b/charts/f5/nginx-ingress/templates/controller-leader-election-configmap.yaml index a473c69a7..440914eb3 100644 --- a/charts/f5/nginx-ingress/templates/controller-leader-election-configmap.yaml +++ b/charts/f5/nginx-ingress/templates/controller-leader-election-configmap.yaml @@ -6,8 +6,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} - {{- if .Values.controller.reportIngressStatus.annotations }} -annotations: - {{ toYaml .Values.controller.reportIngressStatus.annotations | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.controller.reportIngressStatus.annotations }} + annotations: +{{ toYaml .Values.controller.reportIngressStatus.annotations | indent 4 }} +{{- end }} +{{- end }} diff --git a/charts/f5/nginx-ingress/templates/controller-service.yaml b/charts/f5/nginx-ingress/templates/controller-service.yaml index f3e4aecd3..aa02dbf2e 100644 --- a/charts/f5/nginx-ingress/templates/controller-service.yaml +++ b/charts/f5/nginx-ingress/templates/controller-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "nginx-ingress.controller.fullname" . }} + name: {{ default (include "nginx-ingress.controller.fullname" .) .Values.serviceNameOverride }} namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} diff --git a/charts/f5/nginx-ingress/values-icp.yaml b/charts/f5/nginx-ingress/values-icp.yaml index e22cfd6f8..4eb2c6d65 100644 --- a/charts/f5/nginx-ingress/values-icp.yaml +++ b/charts/f5/nginx-ingress/values-icp.yaml @@ -4,7 +4,7 @@ controller: nginxplus: true image: repository: mycluster.icp:8500/kube-system/nginx-plus-ingress - tag: "3.1.0" + tag: "3.1.1" nodeSelector: beta.kubernetes.io/arch: "amd64" proxy: true diff --git a/charts/f5/nginx-ingress/values-plus.yaml b/charts/f5/nginx-ingress/values-plus.yaml index 1adcaf8c4..60e00179c 100644 --- a/charts/f5/nginx-ingress/values-plus.yaml +++ b/charts/f5/nginx-ingress/values-plus.yaml @@ -3,4 +3,4 @@ controller: nginxplus: true image: repository: nginx-plus-ingress - tag: "3.1.0" + tag: "3.1.1" diff --git a/charts/f5/nginx-ingress/values.yaml b/charts/f5/nginx-ingress/values.yaml index 1f1e7d191..d99ff35b9 100644 --- a/charts/f5/nginx-ingress/values.yaml +++ b/charts/f5/nginx-ingress/values.yaml @@ -54,7 +54,7 @@ controller: repository: nginx/nginx-ingress ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag. - # tag: "3.1.0" + # tag: "3.1.1" ## The digest of the Ingress Controller image. ## If digest is specified it has precedence over tag and will be used instead diff --git a/charts/gitlab/gitlab/CHANGELOG.md b/charts/gitlab/gitlab/CHANGELOG.md index 6a7c994ec..40eae6b93 100644 --- a/charts/gitlab/gitlab/CHANGELOG.md +++ b/charts/gitlab/gitlab/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 6.11.2 (2023-05-03) + +No changes. + ## 6.11.1 (2023-05-01) No changes. diff --git a/charts/gitlab/gitlab/Chart.yaml b/charts/gitlab/gitlab/Chart.yaml index f1475cdb6..bffd346a5 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 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 4088b546e..b0fbd69a4 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/gitaly/Chart.yaml index 29fc51da9..de398a5ab 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 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 24a4d4827..5909236cc 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.11.1 +version: 6.11.2 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 7c3cb2acd..9d2b4daf5 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 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 ce1c50792..a6b7c0678 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 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 56d847f39..655aa55b8 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/gitlab-shell/Chart.yaml @@ -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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml index c9a14b9e2..f39db7cd9 100644 --- a/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/gitlab/charts/gitlab/charts/kas/Chart.yaml @@ -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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/mailroom/Chart.yaml index 1f8f5515e..b85057fbe 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/migrations/Chart.yaml index a07588e1a..d1001f6ff 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/praefect/Chart.yaml index d84bfd405..faf059d5f 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/sidekiq/Chart.yaml index 5a74e6215..13155162f 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/spamcheck/Chart.yaml index be69db9ba..5281fa998 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/toolbox/Chart.yaml index 2b65a51b1..58b386fec 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml b/charts/gitlab/gitlab/charts/gitlab/charts/webservice/Chart.yaml index a3054887c..0995d805b 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.11.1 +appVersion: 15.11.2 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.11.1 +version: 6.11.2 diff --git a/charts/gitlab/gitlab/requirements.lock b/charts/gitlab/gitlab/requirements.lock index b28e00204..d647cb1a4 100644 --- a/charts/gitlab/gitlab/requirements.lock +++ b/charts/gitlab/gitlab/requirements.lock @@ -36,4 +36,4 @@ dependencies: repository: https://charts.gitlab.io/ version: 0.3.0 digest: sha256:67477d660a351df330393ce9ed84458eafbc419de2c454339ed7539bde9c45ca -generated: "2023-05-02T08:38:21.039235366Z" +generated: "2023-05-05T06:50:58.331129877Z" diff --git a/charts/gitlab/gitlab/values.yaml b/charts/gitlab/gitlab/values.yaml index 84b1bfddd..23eae1ada 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.11.1" + gitlabVersion: "15.11.2" ## https://docs.gitlab.com/charts/charts/globals#application-resource application: diff --git a/charts/jfrog/artifactory-ha/Chart.yaml b/charts/jfrog/artifactory-ha/Chart.yaml index f02a4932d..ed12f1dfd 100644 --- a/charts/jfrog/artifactory-ha/Chart.yaml +++ b/charts/jfrog/artifactory-ha/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.14.0-0' catalog.cattle.io/release-name: artifactory-ha apiVersion: v2 -appVersion: 7.55.10 +appVersion: 7.55.13 dependencies: - condition: postgresql.enabled name: postgresql @@ -26,4 +26,4 @@ name: artifactory-ha sources: - https://github.com/jfrog/charts type: application -version: 107.55.10 +version: 107.55.13 diff --git a/charts/jfrog/artifactory-ha/values.yaml b/charts/jfrog/artifactory-ha/values.yaml index 56761d367..11db290fe 100644 --- a/charts/jfrog/artifactory-ha/values.yaml +++ b/charts/jfrog/artifactory-ha/values.yaml @@ -217,7 +217,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.61.2 + tag: 7.61.3 imagePullPolicy: IfNotPresent serviceRegistry: ## Service registry (Access) TLS verification skipped if enabled diff --git a/charts/jfrog/artifactory-jcr/CHANGELOG.md b/charts/jfrog/artifactory-jcr/CHANGELOG.md index 291df2d22..7bdb9ae67 100644 --- a/charts/jfrog/artifactory-jcr/CHANGELOG.md +++ b/charts/jfrog/artifactory-jcr/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Container Registry Chart Changelog All changes to this chart will be documented in this file. -## [107.55.10] - Aug 25, 2022 +## [107.55.13] - Aug 25, 2022 * Included event service as mandatory and remove the flag from values.yaml ## [107.41.0] - Jul 22, 2022 diff --git a/charts/jfrog/artifactory-jcr/Chart.yaml b/charts/jfrog/artifactory-jcr/Chart.yaml index d86a62285..b8af794b2 100644 --- a/charts/jfrog/artifactory-jcr/Chart.yaml +++ b/charts/jfrog/artifactory-jcr/Chart.yaml @@ -4,11 +4,11 @@ annotations: catalog.cattle.io/kube-version: '>= 1.14.0-0' catalog.cattle.io/release-name: artifactory-jcr apiVersion: v2 -appVersion: 7.55.10 +appVersion: 7.55.13 dependencies: - name: artifactory repository: file://./charts/artifactory - version: 107.55.10 + version: 107.55.13 description: JFrog Container Registry home: https://jfrog.com/container-registry/ icon: https://raw.githubusercontent.com/jfrog/charts/ea5c3112c24a973f64f3ccd99747323db292a369/stable/artifactory-jcr/logo/jcr-logo.png @@ -27,4 +27,4 @@ name: artifactory-jcr sources: - https://github.com/jfrog/charts type: application -version: 107.55.10 +version: 107.55.13 diff --git a/charts/jfrog/artifactory-jcr/charts/artifactory/Chart.yaml b/charts/jfrog/artifactory-jcr/charts/artifactory/Chart.yaml index 928591b73..5797d6fd7 100644 --- a/charts/jfrog/artifactory-jcr/charts/artifactory/Chart.yaml +++ b/charts/jfrog/artifactory-jcr/charts/artifactory/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 7.55.10 +appVersion: 7.55.13 dependencies: - condition: postgresql.enabled name: postgresql @@ -21,4 +21,4 @@ name: artifactory sources: - https://github.com/jfrog/charts type: application -version: 107.55.10 +version: 107.55.13 diff --git a/charts/jfrog/artifactory-jcr/charts/artifactory/values.yaml b/charts/jfrog/artifactory-jcr/charts/artifactory/values.yaml index 127a507c7..752e7f705 100644 --- a/charts/jfrog/artifactory-jcr/charts/artifactory/values.yaml +++ b/charts/jfrog/artifactory-jcr/charts/artifactory/values.yaml @@ -176,7 +176,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.61.2 + tag: 7.61.3 imagePullPolicy: IfNotPresent serviceRegistry: ## Service registry (Access) TLS verification skipped if enabled diff --git a/charts/jfrog/artifactory-jcr/values.yaml b/charts/jfrog/artifactory-jcr/values.yaml index 6cc72b3af..bbcb2d949 100644 --- a/charts/jfrog/artifactory-jcr/values.yaml +++ b/charts/jfrog/artifactory-jcr/values.yaml @@ -67,4 +67,4 @@ postgresql: enabled: true router: image: - tag: 7.61.2 + tag: 7.61.3 diff --git a/charts/kasten/k10/Chart.lock b/charts/kasten/k10/Chart.lock index abd235102..547820377 100644 --- a/charts/kasten/k10/Chart.lock +++ b/charts/kasten/k10/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: "" version: 15.8.5 digest: sha256:4399c78f4e445e4fbb26151707c9b481fece2002ac02ae20612d9f26e6b66643 -generated: "2023-04-22T05:21:02.333738745Z" +generated: "2023-05-08T13:15:02.108279459Z" diff --git a/charts/kasten/k10/Chart.yaml b/charts/kasten/k10/Chart.yaml index 1fb5eb8a6..0f9a61fbb 100644 --- a/charts/kasten/k10/Chart.yaml +++ b/charts/kasten/k10/Chart.yaml @@ -5,7 +5,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.17.0-0' catalog.cattle.io/release-name: k10 apiVersion: v2 -appVersion: 5.5.9 +appVersion: 5.5.10 dependencies: - name: grafana repository: file://./charts/grafana @@ -20,4 +20,4 @@ maintainers: - email: contact@kasten.io name: kastenIO name: k10 -version: 5.5.901 +version: 5.5.1001 diff --git a/charts/kasten/k10/templates/_definitions.tpl b/charts/kasten/k10/templates/_definitions.tpl index 348815453..02d6ea9e1 100644 --- a/charts/kasten/k10/templates/_definitions.tpl +++ b/charts/kasten/k10/templates/_definitions.tpl @@ -31,9 +31,9 @@ vbrintegrationapi: {{- end -}} {{- define "k10.colocatedServiceLookup" -}} crypto: -- events - garbagecollector - bloblifecyclemanager +- events dashboardbff: - vbrintegrationapi state: @@ -209,3 +209,4 @@ state-svc: {{- define "k10.mcExternalPort" -}}18000{{- end -}} {{- define "k10.defaultKubeVirtVMsUnfreezeTimeout" -}}5m{{- end -}} {{- define "k10.kanisterToolsImageTag" -}}0.91.0{{- end -}} +{{- define "k10.disabledServicesEnvVar" -}}K10_DISABLED_SERVICES{{- end -}} diff --git a/charts/kasten/k10/templates/_helpers.tpl b/charts/kasten/k10/templates/_helpers.tpl index 341bd80b9..6de5c3efe 100644 --- a/charts/kasten/k10/templates/_helpers.tpl +++ b/charts/kasten/k10/templates/_helpers.tpl @@ -3,6 +3,12 @@ {{/* Append services to this list based on helm values */}} {{- $disabledServices := list -}} + {{- if .Values.reporting -}} + {{- if eq .Values.reporting.pdfReports false -}} + {{- $disabledServices = append $disabledServices "admin" -}} + {{- end -}} + {{- end -}} + {{- $disabledServices | join " " -}} {{- end -}} diff --git a/charts/kasten/k10/templates/_k10_container.tpl b/charts/kasten/k10/templates/_k10_container.tpl index 8a1254f49..71abfaf8e 100644 --- a/charts/kasten/k10/templates/_k10_container.tpl +++ b/charts/kasten/k10/templates/_k10_container.tpl @@ -75,6 +75,10 @@ stating that types are not same for the equality check initialDelaySeconds: 3 {{- end }} env: +{{- if eq $service "dashboardbff" }} + - name: {{ include "k10.disabledServicesEnvVar" . }} + value: {{ include "get.disabledServices" . | quote }} +{{- end -}} {{- if eq (include "check.googlecreds" .) "true" }} - name: GOOGLE_APPLICATION_CREDENTIALS value: "/var/run/secrets/kasten.io/kasten-gke-sa.json" @@ -253,11 +257,30 @@ stating that types are not same for the equality check value: {{ (include "get.k10ImageTag" .) | print .Values.global.image.registry "/datamover:" }} {{- end }}{{/* if .Values.global.airgapped.repository */}} + - name: K10_KANISTER_POD_METRICS_IMAGE + {{- if .Values.global.airgapped.repository }} + value: {{ (include "get.k10ImageTag" .) | print .Values.global.airgapped.repository "/metric-sidecar:" }} + {{- else }} + value: {{ (include "get.k10ImageTag" .) | print .Values.global.image.registry "/metric-sidecar:" }} + {{- end }}{{/* if .Values.global.airgapped.repository */}} + - name: KANISTER_POD_READY_WAIT_TIMEOUT valueFrom: configMapKeyRef: name: k10-config key: KanisterPodReadyWaitTimeout + + - name: K10_KANISTER_POD_METRICS_ENABLED + valueFrom: + configMapKeyRef: + name: k10-config + key: KanisterPodMetricSidecarEnabled + - name: PUSHGATEWAY_METRICS_INTERVAL + valueFrom: + configMapKeyRef: + name: k10-config + key: KanisterPodPushgatewayMetricsInterval + {{- end }} - name: LOG_LEVEL valueFrom: diff --git a/charts/kasten/k10/templates/_k10_image_tag.tpl b/charts/kasten/k10/templates/_k10_image_tag.tpl index 480852522..3e0a81c00 100644 --- a/charts/kasten/k10/templates/_k10_image_tag.tpl +++ b/charts/kasten/k10/templates/_k10_image_tag.tpl @@ -1 +1 @@ -{{- define "k10.imageTag" -}}5.5.9{{- end -}} \ No newline at end of file +{{- define "k10.imageTag" -}}5.5.10{{- end -}} \ No newline at end of file diff --git a/charts/kasten/k10/templates/k10-config.yaml b/charts/kasten/k10/templates/k10-config.yaml index 361cdba2c..92fd8bfc8 100644 --- a/charts/kasten/k10/templates/k10-config.yaml +++ b/charts/kasten/k10/templates/k10-config.yaml @@ -31,6 +31,9 @@ data: KanisterStatsTimeout: {{ default (include "k10.defaultKanisterStatsTimeout" .) .Values.kanister.statsTimeout | quote }} KanisterEFSPostRestoreTimeout: {{ default (include "k10.defaultKanisterEFSPostRestoreTimeout" .) .Values.kanister.efsPostRestoreTimeout | quote }} KanisterPodReadyWaitTimeout: {{ .Values.kanister.podReadyWaitTimeout | quote }} + KanisterPodMetricSidecarEnabled: {{ .Values.kanisterPodMetricSidecar.enabled | quote }} + KanisterPodMetricSidecarMetricLifetime: {{ .Values.kanisterPodMetricSidecar.metricLifetime | quote }} + KanisterPodPushgatewayMetricsInterval: {{ .Values.kanisterPodMetricSidecar.pushGatewayInterval | quote }} K10MutatingWebhookTLSCertDir: "/etc/ssl/certs/webhook" K10LimiterGenericVolumeSnapshots: {{ default (include "k10.defaultK10LimiterGenericVolumeSnapshots" .) .Values.limiter.genericVolumeSnapshots | quote }} diff --git a/charts/kasten/k10/templates/prometheus-configmap.yaml b/charts/kasten/k10/templates/prometheus-configmap.yaml index 19355a133..ef6997de3 100644 --- a/charts/kasten/k10/templates/prometheus-configmap.yaml +++ b/charts/kasten/k10/templates/prometheus-configmap.yaml @@ -19,6 +19,13 @@ data: - job_name: httpServiceDiscovery http_sd_configs: - url: {{ printf "http://metering-svc.%s.svc.%s:8000/v0/listScrapeTargets" .Release.Namespace .Values.cluster.domainName }} +{{- if .Values.kanisterPodMetricSidecar.enabled }} + - job_name: pushAggregator + honor_labels: true + honor_timestamps: true + http_sd_configs: + - url: {{ printf "http://metering-svc.%s.svc.%s:8000/v0/push-metric-agg/metrics" .Release.Namespace .Values.cluster.domainName }} +{{- end -}} {{- if .Values.prometheus.scrapeCAdvisor }} - job_name: 'kubernetes-cadvisor' scheme: https diff --git a/charts/kasten/k10/templates/v0services.yaml b/charts/kasten/k10/templates/v0services.yaml index 2507b7c25..e1fcf00b6 100644 --- a/charts/kasten/k10/templates/v0services.yaml +++ b/charts/kasten/k10/templates/v0services.yaml @@ -56,7 +56,7 @@ metadata: apiVersion: getambassador.io/v3alpha1 kind: Mapping name: {{ $secondary }}-mapping - prefix: /{{ $postfix }}/{{ $secondary }}-svc/ + prefix: /{{ $postfix | trimPrefix "/" | trimSuffix "/" }}/{{ $secondary }}-svc/ rewrite: / service: {{ $colocConfig.primary }}-svc.{{ $.Release.Namespace }}:{{ $colocConfig.port }} timeout_ms: 30000 diff --git a/charts/kasten/k10/values.schema.json b/charts/kasten/k10/values.schema.json index fee872905..5f39f4b73 100644 --- a/charts/kasten/k10/values.schema.json +++ b/charts/kasten/k10/values.schema.json @@ -1999,6 +1999,31 @@ "title": "Kanister pod custom annotations", "description": "Custom annotations added to pods managed by Kanister" }, + "kanisterPodMetricSidecar": { + "type": "object", + "title": "Metric sidecar for ephemeral pods", + "description": "Sidecar container for gathering metrics from ephemeral pods", + "properties": { + "enabled": { + "type": "boolean", + "default": false, + "title": "Enable sidecar container", + "description": "Enable sidecar container for gathering metrics from ephemeral pods" + }, + "metricLifetime":{ + "type": "string", + "default": "720h", + "title": "Lifetime of ephemeral pods metrics", + "description": "Lifetime of ephemeral pods metrics" + }, + "pushGatewayInterval":{ + "type": "string", + "default": "1m", + "title": "Pushgateway metrics interval", + "description": "The interval of sending metrics into the Pushgateway" + } + } + }, "genericVolumeSnapshot": { "type": "object", "title": "Generic Volume Snapshot restore pods config", @@ -2587,6 +2612,17 @@ "default": [], "title": "List of applications to be excluded", "description": "List of applications to be excluded from the dashboard & compliance considerations" + }, + "reporting": { + "type": "object", + "properties": { + "pdfReports": { + "title": "Enable PDF reports", + "description": "Enable download of PDF reports in the Dashboard", + "type": "boolean", + "default": true + } + } } } } diff --git a/charts/kasten/k10/values.yaml b/charts/kasten/k10/values.yaml index e762243aa..1089d47c2 100644 --- a/charts/kasten/k10/values.yaml +++ b/charts/kasten/k10/values.yaml @@ -381,6 +381,11 @@ kanisterPodCustomLabels : "" kanisterPodCustomAnnotations : "" +kanisterPodMetricSidecar: + enabled: false + metricLifetime: "720h" + pushGatewayInterval: "1m" + genericVolumeSnapshot: resources: requests: @@ -486,3 +491,6 @@ vault: kubeVirtVMs: snapshot: unfreezeTimeout: "5m" + +reporting: + pdfReports: true diff --git a/charts/kubecost/cost-analyzer/Chart.yaml b/charts/kubecost/cost-analyzer/Chart.yaml index b75ed74f4..59d16bb6b 100644 --- a/charts/kubecost/cost-analyzer/Chart.yaml +++ b/charts/kubecost/cost-analyzer/Chart.yaml @@ -7,7 +7,7 @@ annotations: catalog.cattle.io/featured: "2" catalog.cattle.io/release-name: cost-analyzer apiVersion: v2 -appVersion: 1.102.2 +appVersion: 1.103.1 dependencies: - condition: global.grafana.enabled name: grafana @@ -25,4 +25,4 @@ description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to moni cloud costs. icon: https://partner-charts.rancher.io/assets/logos/kubecost.png name: cost-analyzer -version: 1.102.2 +version: 1.103.1 diff --git a/charts/kubecost/cost-analyzer/charts/grafana/values.yaml b/charts/kubecost/cost-analyzer/charts/grafana/values.yaml index c2a885e94..7764c58b6 100644 --- a/charts/kubecost/cost-analyzer/charts/grafana/values.yaml +++ b/charts/kubecost/cost-analyzer/charts/grafana/values.yaml @@ -25,7 +25,7 @@ livenessProbe: image: repository: grafana/grafana - tag: 9.4.3 + tag: 9.4.7 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -256,7 +256,7 @@ smtp: ## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards sidecar: - image: kiwigrid/k8s-sidecar:1.21.0 + image: kiwigrid/k8s-sidecar:1.23.1 imagePullPolicy: IfNotPresent resources: # limits: diff --git a/charts/kubecost/cost-analyzer/charts/prometheus/README.md b/charts/kubecost/cost-analyzer/charts/prometheus/README.md index ebb856bc2..b7c5dba65 100644 --- a/charts/kubecost/cost-analyzer/charts/prometheus/README.md +++ b/charts/kubecost/cost-analyzer/charts/prometheus/README.md @@ -206,6 +206,7 @@ Parameter | Description | Default `initChownData.resources` | init-chown-data pod resource requests & limits | `{}` `kube-state-metrics.disabled` | If false, create kube-state-metrics sub-chart, see the [kube-state-metrics chart for configuration options](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) | `false` `nodeExporter.enabled` | If true, create node-exporter | `true` +`nodeExporter.dnsPolicy` | node-exporter dns policy | `ClusterFirstWithHostNet` `nodeExporter.name` | node-exporter container name | `node-exporter` `nodeExporter.image.repository` | node-exporter container image repository| `prom/node-exporter` `nodeExporter.image.tag` | node-exporter container image tag | `v0.18.1` diff --git a/charts/kubecost/cost-analyzer/charts/prometheus/templates/node-exporter-daemonset.yaml b/charts/kubecost/cost-analyzer/charts/prometheus/templates/node-exporter-daemonset.yaml index e3f032c97..0b01b6063 100644 --- a/charts/kubecost/cost-analyzer/charts/prometheus/templates/node-exporter-daemonset.yaml +++ b/charts/kubecost/cost-analyzer/charts/prometheus/templates/node-exporter-daemonset.yaml @@ -36,6 +36,9 @@ spec: {{ toYaml .Values.nodeExporter.affinity | indent 8 }} {{- end }} serviceAccountName: {{ template "prometheus.serviceAccountName.nodeExporter" . }} +{{- if .Values.nodeExporter.dnsPolicy }} + dnsPolicy: "{{ .Values.nodeExporter.dnsPolicy }}" +{{- end }} {{- if .Values.nodeExporter.priorityClassName }} priorityClassName: "{{ .Values.nodeExporter.priorityClassName }}" {{- end }} diff --git a/charts/kubecost/cost-analyzer/charts/prometheus/values.yaml b/charts/kubecost/cost-analyzer/charts/prometheus/values.yaml index 8e76b90d1..0c01b355f 100644 --- a/charts/kubecost/cost-analyzer/charts/prometheus/values.yaml +++ b/charts/kubecost/cost-analyzer/charts/prometheus/values.yaml @@ -43,7 +43,7 @@ alertmanager: ## image: repository: quay.io/prometheus/alertmanager - tag: v0.23.0 + tag: v0.25.0 pullPolicy: IfNotPresent ## alertmanager priorityClassName @@ -406,6 +406,10 @@ nodeExporter: ## hostPID: true + ## node-exporter dns policy + ## + dnsPolicy: ClusterFirstWithHostNet + ## node-exporter container name ## name: node-exporter @@ -414,7 +418,7 @@ nodeExporter: ## image: repository: prom/node-exporter - tag: v1.3.0 + tag: v1.5.0 pullPolicy: IfNotPresent ## Specify if a Pod Security Policy for node-exporter must be created @@ -922,7 +926,7 @@ pushgateway: ## image: repository: prom/pushgateway - tag: v1.4.2 + tag: v1.5.1 pullPolicy: IfNotPresent ## pushgateway priorityClassName diff --git a/charts/kubecost/cost-analyzer/questions.yaml b/charts/kubecost/cost-analyzer/questions.yaml index 3569a25e0..96cf24939 100644 --- a/charts/kubecost/cost-analyzer/questions.yaml +++ b/charts/kubecost/cost-analyzer/questions.yaml @@ -19,7 +19,31 @@ questions: label: CostAnalyzer Persistent Volume Size type: string default: "0.2Gi" - + # Amazon EKS + - variable: AmazonEKS.enabled + label: Amazon EKS cluster + description: "If true, Kubecost will be installed with the images from https://gallery.ecr.aws/kubecost/" + type: boolean + default: false + show_subquestion_if: true + group: General Settings + subquestions: + - variable: kubecostFrontend.image + label: Kubecost frontend image for Amazon EKS + type: string + default: "public.ecr.aws/kubecost/frontend" + - variable: kubecostModel.image + label: Kubecost cost-model image for Amazon EKS + type: string + default: "public.ecr.aws/kubecost/cost-model" + - variable: prometheus.server.image.repository + label: Kubecost Prometheus image for Amazon EKS + type: string + default: "public.ecr.aws/kubecost/prometheus" + - variable: prometheus.server.image.tag + label: Kubecost Prometheus image tag for Amazon EKS + type: string + default: "v2.35.0" # Prometheus Server - variable: global.prometheus.enabled label: Enable Prometheus @@ -84,7 +108,7 @@ questions: - variable: prometheus.alertmanager.enabled label: Enable AlertManager type: boolean - default: true + default: false group: "AlertManager" - variable: prometheus.alertmanager.persistentVolume.enabled label: Create Persistent Volume for AlertManager @@ -116,7 +140,7 @@ questions: - variable: prometheus.pushgateway.enabled label: Enable PushGateway type: boolean - default: true + default: false group: "PushGateway" - variable: prometheus.pushgateway.persistentVolume.enabled label: Create Persistent Volume for PushGateway @@ -147,7 +171,7 @@ questions: - variable: ingress.enabled label: Enable Ingress description: "Expose app using Ingress (Layer 7 Load Balancer)" - default: true + default: false type: boolean show_subquestion_if: true group: "Services and Load Balancing" diff --git a/charts/kubecost/cost-analyzer/templates/_helpers.tpl b/charts/kubecost/cost-analyzer/templates/_helpers.tpl index a1d4f2eb5..0c916da42 100644 --- a/charts/kubecost/cost-analyzer/templates/_helpers.tpl +++ b/charts/kubecost/cost-analyzer/templates/_helpers.tpl @@ -5,6 +5,9 @@ Expand the name of the chart. {{- define "cost-analyzer.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "query-service.name" -}} +{{- default "query-service" | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{/* Create a default fully qualified app name. @@ -24,6 +27,10 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} +{{- define "query-service.fullname" -}} +{{- printf "%s-%s" .Release.Name "query-service" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{/* Create the fully qualified name for Prometheus server service. */}} @@ -96,6 +103,12 @@ helm.sh/chart: {{ include "cost-analyzer.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} +{{- define "kubecost.queryService.chartLabels" -}} +app.kubernetes.io/name: {{ include "query-service.name" . }} +helm.sh/chart: {{ include "cost-analyzer.chart" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} {{/* @@ -115,6 +128,13 @@ Create the name of the service account {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} +{{- define "query-service.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "query-service.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} {{/* Create the common labels. @@ -126,6 +146,10 @@ app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app: cost-analyzer {{- end -}} +{{- define "query-service.commonLabels" -}} +{{ include "kubecost.queryService.chartLabels" . }} +app: query-service +{{- end -}} {{/* Create the selector labels. @@ -135,6 +159,11 @@ app.kubernetes.io/name: {{ include "cost-analyzer.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app: cost-analyzer {{- end -}} +{{- define "query-service.selectorLabels" -}} +app.kubernetes.io/name: {{ include "query-service.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app: query-service +{{- end -}} {{/* Return the appropriate apiVersion for daemonset. diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-cloud-cost-reports-configmap.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-cloud-cost-reports-configmap.yaml new file mode 100644 index 000000000..97e74156f --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-cloud-cost-reports-configmap.yaml @@ -0,0 +1,13 @@ +{{- if .Values.global.cloudCostReports }} +{{- if .Values.global.cloudCostReports.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{default "cloud-cost-report-configs" .Values.cloudCostReportConfigmapName }} + namespace: {{ .Release.Namespace }} + labels: + {{ include "cost-analyzer.commonLabels" . | nindent 4 }} +data: + cloud-cost-reports.json: '{{ toJson .Values.global.cloudCostReports.reports }}' +{{- end -}} +{{- end -}} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-config-map-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-config-map-template.yaml index 399a042b1..20033422d 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-config-map-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-config-map-template.yaml @@ -15,7 +15,9 @@ data: {{ else }} prometheus-alertmanager-endpoint: {{ .Values.global.notifications.alertmanager.fqdn }} {{- end -}} - {{if .Values.global.amp.enabled }} + {{ if .Values.global.gmp.enabled }} + prometheus-server-endpoint: {{ .Values.global.gmp.prometheusServerEndpoint }} + {{- else if .Values.global.amp.enabled }} prometheus-server-endpoint: {{ .Values.global.amp.prometheusServerEndpoint }} {{- else if .Values.global.prometheus.enabled }} {{- if .Values.global.zone }} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml index 989c05e38..0eb9091a0 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml @@ -10,6 +10,13 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- with .Values.persistentVolume.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.persistentVolume.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: accessModes: - ReadWriteOnce diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index 7478ba525..8f4cc086e 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -73,6 +73,11 @@ spec: restartPolicy: Always serviceAccountName: {{ template "cost-analyzer.serviceAccountName" . }} volumes: + {{- if .Values.global.gcpstore.enabled }} + - name: ubbagent-config + configMap: + name: ubbagent-config + {{- end }} {{- if .Values.hosted }} - name: config-store secret: @@ -213,6 +218,16 @@ spec: secret: secretName: {{ .Values.saml.secretName }} {{- end }} + {{- if .Values.saml.encryptionCertSecret }} + - name: saml-encryption-cert + secret: + secretName: {{ .Values.saml.encryptionCertSecret }} + {{- end }} + {{- if .Values.saml.decryptionKeySecret }} + - name: saml-decryption-key + secret: + secretName: {{ .Values.saml.decryptionKeySecret }} + {{- end }} {{- if .Values.saml.metadataSecretName }} - name: metadata-secret-volume secret: @@ -308,6 +323,29 @@ spec: runAsUser: 0 {{ end }} containers: + {{- if .Values.global.gmp.enabled }} + - name: {{ .Values.global.gmp.gmpProxy.name }} + image: {{ .Values.global.gmp.gmpProxy.image }} + {{- if .Values.global.gmp.gmpProxy.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.gmp.gmpProxy.imagePullPolicy }} + {{- else }} + imagePullPolicy: Always + {{- end }} + args: + - "--web.listen-address=:{{ .Values.global.gmp.gmpProxy.port }}" + - "--query.project-id={{ .Values.global.gmp.gmpProxy.projectId }}" + ports: + - name: web + containerPort: {{ .Values.global.gmp.gmpProxy.port | int }} + readinessProbe: + httpGet: + path: /-/ready + port: web + livenessProbe: + httpGet: + path: /-/healthy + port: web + {{- end }} {{- if .Values.global.amp.enabled }} - name: sigv4proxy image: {{ .Values.sigV4Proxy.image }} @@ -337,6 +375,28 @@ spec: {{- toYaml .Values.sigV4Proxy.extraEnv | nindent 10 }} {{- end }} {{- end }} + {{- if .Values.global.gcpstore.enabled }} + - name: ubbagent + image: gcr.io/kubecost1/gcp-mp/ent/cost-model/ubbagent:1.0 + env: + - name: AGENT_CONFIG_FILE + value: "/etc/ubbagent/config.yaml" + - name: AGENT_LOCAL_PORT + value: "6080" + - name: AGENT_ENCODED_KEY + valueFrom: + secretKeyRef: + name: {{ default "kubecost-reporting-secret" .Values.reportingSecret }} + key: reporting-key + - name: AGENT_CONSUMER_ID + valueFrom: + secretKeyRef: + name: {{ default "kubecost-reporting-secret" .Values.reportingSecret }} + key: consumer-id + volumeMounts: + - name: ubbagent-config + mountPath: /etc/ubbagent + {{- end }} {{- if .Values.kubecostModel }} {{- if .Values.kubecostModel.openSourceOnly }} - image: quay.io/kubecost1/kubecost-cost-model:{{ .Values.imageVersion }} @@ -474,6 +534,14 @@ spec: - name: secret-volume mountPath: /var/configs/secret-volume {{- end }} + {{- if .Values.saml.encryptionCertSecret }} + - name: saml-encryption-cert + mountPath: /var/configs/saml-encryption-cert + {{- end }} + {{- if .Values.saml.decryptionKeySecret }} + - name: saml-decryption-key + mountPath: /var/configs/saml-decryption-key + {{- end }} {{- if .Values.saml.metadataSecretName }} - name: metadata-secret-volume mountPath: /var/configs/metadata-secret-volume @@ -528,6 +596,10 @@ spec: - name: ASSET_REPORT_CONFIGMAP_NAME value: {{ .Values.assetReportConfigmapName }} {{- end }} + {{- if .Values.cloudCostReportConfigmapName }} + - name: CLOUD_COST_REPORT_CONFIGMAP_NAME + value: {{ .Values.cloudCostReportConfigmapName }} + {{- end }} {{- if .Values.savedReportConfigmapName }} - name: SAVED_REPORT_CONFIGMAP_NAME value: {{ .Values.savedReportConfigmapName }} @@ -899,6 +971,10 @@ spec: - name: SAML_RBAC_ENABLED value: "true" {{- end }} + {{- if and .Values.saml.encryptionCertSecret .Values.saml.decryptionKeySecret }} + - name: SAML_RESPONSE_ENCRYPTED + value: "true" + {{- end}} {{- end }} {{- end }} {{- if and (.Values.prometheus.server.global.external_labels.cluster_id) (not .Values.prometheus.server.clusterIDConfigmap) }} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml index 9d8a74074..f616ebf7e 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml @@ -101,6 +101,12 @@ data: } {{- end }} + {{- if and (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) (gt (.Values.kubecostDeployment.queryServiceReplicas | toString | atoi) 0) }} + upstream queryservice { + server {{ .Release.Name }}-query-service-load-balancer.{{ .Release.Namespace }}:9003; + } + {{- end }} + server { server_name _; root /var/www; @@ -285,5 +291,31 @@ data: proxy_pass http://model/isAdminAuthenticated; } {{- end }} + + {{- if and (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) (gt (.Values.kubecostDeployment.queryServiceReplicas | toString | atoi) 0) }} + location /model/allocation { + proxy_connect_timeout 180; + proxy_send_timeout 180; + proxy_read_timeout 180; + proxy_pass http://queryservice/allocation; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location /model/assets { + proxy_connect_timeout 180; + proxy_send_timeout 180; + proxy_read_timeout 180; + proxy_pass http://queryservice/assets; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + {{- end }} } {{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-ingress-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-ingress-template.yaml index ac2979dd7..85394080e 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-ingress-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-ingress-template.yaml @@ -18,7 +18,10 @@ metadata: name: {{ $fullName }} namespace: {{ .Release.Namespace }} labels: - {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- with .Values.ingress.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-pvc-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-pvc-template.yaml index 662ea031a..82a9cdcd0 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-pvc-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-pvc-template.yaml @@ -8,6 +8,13 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- with .Values.persistentVolume.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.persistentVolume.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: accessModes: - ReadWriteOnce diff --git a/charts/kubecost/cost-analyzer/templates/gcpstore-config-map-template.yaml b/charts/kubecost/cost-analyzer/templates/gcpstore-config-map-template.yaml new file mode 100644 index 000000000..0c5da0df9 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/gcpstore-config-map-template.yaml @@ -0,0 +1,61 @@ +{{- if .Values.global.gcpstore.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: ubbagent-config +data: + config.yaml: | + # The identity section contains authentication information used + # by the agent. + identities: + - name: gcp + gcp: + # This parameter accepts a base64-encoded JSON service + # account key. The value comes from the reporting secret. + encodedServiceAccountKey: $AGENT_ENCODED_KEY + + # The metrics section defines the metric that will be reported. + # Metric names should match verbatim the identifiers created + # during pricing setup. + metrics: + + - name: commercial_ent_node_hr + type: int + endpoints: + - name: servicecontrol + + # The passthrough marker indicates that no aggregation should + # occur for this metric. Reports received are immediately sent + # to the reporting endpoint. We use passthrough for the + # instance_time metric since reports are generated + # automatically by a heartbeat source defined in a later + # section. + passthrough: {} + + # The endpoints section defines where metering data is ultimately + # sent. Currently supported endpoints include: + # * disk - some directory on the local filesystem + # * servicecontrol - Google Service Control + endpoints: + - name: servicecontrol + servicecontrol: + identity: gcp + # The service name is unique to your application and will be + # provided during onboarding. + serviceName: kubecost-ent.endpoints.kubecost-public.cloud.goog + consumerId: $AGENT_CONSUMER_ID # From the reporting secret. + + + # The sources section lists metric data sources run by the agent + # itself. The currently-supported source is 'heartbeat', which + # sends a defined value to a metric at a defined interval. In + # this example, the heartbeat sends a 60-second value through the + # "instance_time" metric every minute. + sources: + - name: commercial_ent_node_hr_heartbeat + heartbeat: + metric: commercial_ent_node_hr + intervalSeconds: 3600 + value: + int64Value: 1 +{{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml b/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml index 467322d3d..7ed45db4c 100644 --- a/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml @@ -212,12 +212,8 @@ spec: value: {{ .Release.Namespace }} - name: TURNDOWN_DEPLOYMENT value: {{ template "kubecost.clusterControllerName" . }} - {{- if .Values.kubecostProductConfigs }} - {{- if .Values.kubecostProductConfigs.gcpSecretName }} - name: GOOGLE_APPLICATION_CREDENTIALS value: /var/keys/service-key.json - {{- end }} - {{- end }} - name: CC_LOG_LEVEL value: {{ .Values.clusterController.logLevel | default "info" }} - name: CC_KUBESCALER_COST_MODEL_PATH @@ -298,6 +294,34 @@ spec: repeat: type: string enum: [none, daily, weekly] + status: + type: object + properties: + state: + type: string + lastUpdated: + format: date-time + type: string + current: + type: string + scaleDownId: + type: string + nextScaleDownTime: + format: date-time + type: string + scaleDownMetadata: + additionalProperties: + type: string + type: object + scaleUpID: + type: string + nextScaleUpTime: + format: date-time + type: string + scaleUpMetadata: + additionalProperties: + type: string + type: object additionalPrinterColumns: - name: State type: string diff --git a/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-binding-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-binding-template.yaml new file mode 100644 index 000000000..9409aa821 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-binding-template.yaml @@ -0,0 +1,34 @@ +{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) }} +{{- if gt .Values.kubecostDeployment.queryServiceReplicas 0 }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ template "query-service.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "query-service.serviceAccountName" . }} +subjects: + - kind: ServiceAccount + name: {{ template "query-service.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ template "query-service.serviceAccountName" . }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ template "query-service.serviceAccountName" . }} +subjects: + - kind: ServiceAccount + name: {{ template "query-service.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} +{{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-template.yaml new file mode 100644 index 000000000..4cc3c2aa4 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/query-service-cluster-role-template.yaml @@ -0,0 +1,109 @@ +{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) }} +{{- if gt .Values.kubecostDeployment.queryServiceReplicas 0 }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + namespace: {{ .Release.Namespace }} + name: {{ template "query-service.serviceAccountName" . }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +rules: +- apiGroups: + - '' + resources: + - "pods/log" + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ template "query-service.serviceAccountName" . }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +rules: + - apiGroups: + - '' + resources: + - configmaps + - deployments + - nodes + - pods + - events + - services + - resourcequotas + - replicationcontrollers + - limitranges + - persistentvolumeclaims + - persistentvolumes + - namespaces + - endpoints + verbs: + - get + - list + - watch + - apiGroups: + - extensions + resources: + - daemonsets + - deployments + - replicasets + verbs: + - get + - list + - watch + - apiGroups: + - apps + resources: + - statefulsets + - deployments + - daemonsets + - replicasets + verbs: + - list + - watch + - apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - get + - list + - watch + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - get + - list + - watch + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - get + - list + - watch + - apiGroups: + - storage.k8s.io + resources: + - storageclasses + verbs: + - get + - list + - watch + - apiGroups: + - events.k8s.io + resources: + - events + verbs: + - get + - list + - watch +{{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml new file mode 100644 index 000000000..db58d4b78 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml @@ -0,0 +1,107 @@ +{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) }} +{{- if gt .Values.kubecostDeployment.queryServiceReplicas 0 }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ template "query-service.fullname" . }} + namespace: {{ .Release.Name }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +spec: + replicas: {{ .Values.kubecostDeployment.queryServiceReplicas }} + selector: + matchLabels: + app.kubernetes.io/name: query-service + app.kubernetes.io/instance: {{ .Release.Name }} + app: query-service + template: + metadata: + labels: + app.kubernetes.io/name: query-service + app.kubernetes.io/instance: {{ .Release.Name }} + app: query-service + spec: + restartPolicy: Always + serviceAccountName: {{ template "query-service.serviceAccountName" . }} + volumes: + - name: persistent-configs + emptyDir: {} + - name: persistent-db + emptyDir: {} + {{- $etlBackupBucketSecret := "" }} + {{- if .Values.kubecostModel.etlBucketConfigSecret }} + {{- $etlBackupBucketSecret = .Values.kubecostModel.etlBucketConfigSecret }} + {{- else if and .Values.global.thanos.enabled (ne (typeOf .Values.kubecostModel.etlBucketConfigSecret) "string") }} + {{- $etlBackupBucketSecret = .Values.thanos.storeSecretName }} + {{- end }} + {{- if $etlBackupBucketSecret }} + - name: etl-bucket-config + secret: + defaultMode: 420 + secretName: {{ $etlBackupBucketSecret }} + {{- end }} + initContainers: + - name: config-db-perms-fix + image: busybox + command: ["sh", "-c", "/bin/chmod -R 777 /var/configs && /bin/chmod -R 777 /var/db"] + volumeMounts: + - name: persistent-configs + mountPath: /var/configs + - name: persistent-db + mountPath: /var/db + securityContext: + runAsUser: 0 + containers: + - name: query-service + {{- if .Values.kubecostModel }} + {{- if .Values.kubecostModel.openSourceOnly }} + image: quay.io/kubecost1/kubecost-cost-model:{{ .Values.imageVersion }} + {{- else if .Values.kubecostModel.fullImageName }} + image: {{ .Values.kubecostModel.fullImageName }} + {{- else if .Values.imageVersion }} + image: {{ .Values.kubecostModel.image }}:{{ .Values.imageVersion }} + {{- else }} + image: {{ .Values.kubecostModel.image }}:prod-{{ $.Chart.AppVersion }} + {{ end }} + {{- else }} + image: gcr.io/kubecost1/cost-model:prod-{{ $.Chart.AppVersion }} + {{ end }} + readinessProbe: + httpGet: + path: /healthz + port: 9003 + initialDelaySeconds: 30 + periodSeconds: 10 + failureThreshold: 200 + imagePullPolicy: Always + args: ["query-service"] + ports: + - name: tcp-model + containerPort: 9003 + protocol: TCP + volumeMounts: + - name: persistent-configs + mountPath: /var/configs + - name: etl-bucket-config + mountPath: /var/configs/etl + - name: persistent-db + mountPath: /var/db + env: + - name: CONFIG_PATH + value: /var/configs/ + - name: DB_PATH + value: /var/db/ + - name: ETL_FILE_STORE_ENABLED + value: "true" + {{- if $etlBackupBucketSecret }} + - name: ETL_BUCKET_CONFIG + value: "/var/configs/etl/object-store.yaml" + {{- end }} + - name: ETL_TO_DISK_ENABLED + value: "true" + - name: ETL_PATH_PREFIX + value: "/var/db" + - name: CLOUD_PROVIDER_API_KEY + value: "AIzaSyDXQPG_MHUEy9neR7stolq6l0ujXmjJlvk" # The GCP Pricing API key.This GCP api key is expected to be here and is limited to accessing google's billing API.' +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/query-service-service-account-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-service-account-template.yaml new file mode 100644 index 000000000..cfd33bbcc --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/query-service-service-account-template.yaml @@ -0,0 +1,17 @@ +{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) }} +{{- if gt .Values.kubecostDeployment.queryServiceReplicas 0 }} +{{- if .Values.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ template "query-service.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} + labels: + {{ include "query-service.commonLabels" . | nindent 4 }} +{{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} +{{- end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml new file mode 100644 index 000000000..35f66eb29 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml @@ -0,0 +1,19 @@ +{{- if and (not .Values.agent) (not .Values.cloudAgent) (.Values.kubecostDeployment) (.Values.kubecostDeployment.queryServiceReplicas) }} +{{- if gt .Values.kubecostDeployment.queryServiceReplicas 0 }} +kind: Service +apiVersion: v1 +metadata: + name: {{ .Release.Name }}-query-service-load-balancer + namespace: {{ .Release.Namespace }} + labels: +{{ include "query-service.commonLabels" . | nindent 4 }} +spec: + selector: +{{ include "query-service.selectorLabels" . | nindent 4 }} + type: "LoadBalancer" + ports: + - name: tcp-query-service + port: 9003 + targetPort: 9003 +{{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/values-cloud-agent.yaml b/charts/kubecost/cost-analyzer/values-cloud-agent.yaml index 9d4c5090f..8887928e4 100644 --- a/charts/kubecost/cost-analyzer/values-cloud-agent.yaml +++ b/charts/kubecost/cost-analyzer/values-cloud-agent.yaml @@ -34,3 +34,15 @@ prometheus: kube-state-metrics: enabled: false disabled: true + extraScrapeConfigs: | + - job_name: kubecost-cloud-agent + honor_labels: true + scrape_interval: 1m + scrape_timeout: 60s + metrics_path: /metrics + scheme: http + dns_sd_configs: + - names: + - {{ .Release.Name }}-cloud-agent + type: 'A' + port: 9005 diff --git a/charts/kubecost/cost-analyzer/values.yaml b/charts/kubecost/cost-analyzer/values.yaml index 823c6ec6d..a73f6f865 100644 --- a/charts/kubecost/cost-analyzer/values.yaml +++ b/charts/kubecost/cost-analyzer/values.yaml @@ -22,6 +22,27 @@ global: proxy: true # If true, the kubecost frontend will route to your grafana through its service endpoint # fqdn: cost-analyzer-grafana.default.svc + # Enable only when you are using GCP Marketplace ENT listing. Learn more at https://console.cloud.google.com/marketplace/product/kubecost-public/kubecost-ent + gcpstore: + enabled: false + + # Google Cloud Managed Service for Prometheus + gmp: + # Remember to set up these parameters when install the Kubecost Helm chart with `global.gmp.enabled=true` if you want to use GMP self-deployed collection (Recommended) to ultilize Kubecost scrape configs. + # If enabling GMP, it is highly recommended to utilize Google's distribution of Prometheus. + # Learn more at https://cloud.google.com/stackdriver/docs/managed-prometheus/setup-unmanaged + # --set prometheus.server.image.repository="gke.gcr.io/prometheus-engine/prometheus" \ + # --set prometheus.server.image.tag="v2.35.0-gmp.2-gke.0" + enabled: false # If true, kubecost will be configured to use GMP Prometheus image and query from Google Cloud Managed Service for Prometheus. + prometheusServerEndpoint: http://localhost:8085/ # The prometheus service endpoint used by kubecost. The calls are forwarded through the GMP Prom proxy side car to the GMP database. + gmpProxy: + enabled: false + image: gke.gcr.io/prometheus-engine/frontend:v0.4.1-gke.0 # GMP Prometheus proxy image that serve as an endpoint to query metrics from GMP + imagePullPolicy: Always + name: gmp-proxy + port: 8085 + projectId: YOUR_PROJECT_ID # example GCP project ID + # Amazon Managed Service for Prometheus amp: enabled: false # If true, kubecost will be configured to remote_write and query from Amazon Managed Service for Prometheus. @@ -165,6 +186,19 @@ global: cloudBreakdown: "service" cloudJoin: "label:kubernetes_namespace" + # Set saved Cloud Cost report(s) accessible from /reports + # Ref: http://docs.kubecost.com/saved-reports + cloudCostReports: + enabled: false # If true, overwrites report parameters set through UI + reports: + - title: "Cloud Cost Report 0" + window: "today" + aggregateBy: "type" + accumulate: false # daily resolution + filters: + - property: "cluster" + value: "cluster-one" + podAnnotations: {} # iam.amazonaws.com/role: role-arn additionalLabels: {} @@ -197,6 +231,8 @@ saml: # audienceURI: "http://localhost:9090" # by convention, the same as the appRootURL, but any string uniquely identifying kubecost to your samp IDP. Optional if you follow the convention # nameIDFormat: "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" If your SAML provider requires a specific nameid format # isGLUUProvider: false # An additional URL parameter must be appended for GLUU providers + # encryptionCertSecret: "kubecost-saml-cert" # k8s secret where the x509 certificate used to encrypt an Okta saml response is stored + # decryptionKeySecret: "kubecost-sank-decryption-key" # k8s secret where the private key associated with the encryptionCertSecret is stored rbac: enabled: false groups: @@ -423,6 +459,9 @@ kubecostModel: ingress: enabled: false # className: nginx + labels: + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" annotations: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -500,6 +539,8 @@ persistentVolume: enabled: true # Note that setting this to false means configurations will be wiped out on pod restart. # storageClass: "-" # # existingClaim: kubecost-cost-analyzer # a claim in the same namespace as kubecost + labels: {} + annotations: {} service: type: ClusterIP @@ -606,15 +647,15 @@ prometheus: groups: - name: CPU rules: - - expr: sum(rate(container_cpu_usage_seconds_total{container_name!=""}[5m])) + - expr: sum(rate(container_cpu_usage_seconds_total{container!=""}[5m])) record: cluster:cpu_usage:rate5m - - expr: rate(container_cpu_usage_seconds_total{container_name!=""}[5m]) + - expr: rate(container_cpu_usage_seconds_total{container!=""}[5m]) record: cluster:cpu_usage_nosum:rate5m - - expr: avg(irate(container_cpu_usage_seconds_total{container_name!="POD", container_name!=""}[5m])) by (container_name,pod_name,namespace) + - expr: avg(irate(container_cpu_usage_seconds_total{container!="POD", container!=""}[5m])) by (container,pod,namespace) record: kubecost_container_cpu_usage_irate - - expr: sum(container_memory_working_set_bytes{container_name!="POD",container_name!=""}) by (container_name,pod_name,namespace) + - expr: sum(container_memory_working_set_bytes{container!="POD",container!=""}) by (container,pod,namespace) record: kubecost_container_memory_working_set_bytes - - expr: sum(container_memory_working_set_bytes{container_name!="POD",container_name!=""}) + - expr: sum(container_memory_working_set_bytes{container!="POD",container!=""}) record: kubecost_cluster_memory_working_set_bytes - name: Savings rules: @@ -695,10 +736,10 @@ networkCosts: # Internet contains a list of address/range that will be # classified as internet traffic. This is synonymous with traffic - # that cannot be classified within the cluster. - # NOTE: Internet classification filters are executed _after_ + # that cannot be classified within the cluster. + # NOTE: Internet classification filters are executed _after_ # NOTE: direct-classification, but before in-zone, in-region, - # NOTE: and cross-region. + # NOTE: and cross-region. internet: [] # Direct Classification specifically maps an ip address or range @@ -768,11 +809,12 @@ kubecostDeployment: # maxSurge: 1 # maxUnavailable: 1 # type: RollingUpdate + queryServiceReplicas: 0 # Kubecost Cluster Controller for Right Sizing and Cluster Turndown clusterController: enabled: false - image: gcr.io/kubecost1/cluster-controller:v0.6.2 + image: gcr.io/kubecost1/cluster-controller:v0.7.0 imagePullPolicy: Always kubescaler: # If true, will cause all (supported) workloads to be have their requests @@ -877,7 +919,7 @@ federatedETL: # If not set, the federator will attempt to federated all clusters pushing to the federated storage. clusters: [] # federator.primaryClusterID is an optional parameter that should be used when reconciliation is expected to occur on the Primary. - # primaryClusterID: "cluster_id" + # primaryClusterID: "cluster_id" kubecostAdmissionController: enabled: false @@ -889,6 +931,7 @@ kubecostAdmissionController: costEventsAudit: enabled: false + # readonly: false # disable updates to kubecost from the frontend UI and via POST request # These configs can also be set from the Settings page in the Kubecost product UI diff --git a/charts/loft/loft/Chart.yaml b/charts/loft/loft/Chart.yaml index 325c15e73..7e91b8918 100644 --- a/charts/loft/loft/Chart.yaml +++ b/charts/loft/loft/Chart.yaml @@ -28,4 +28,4 @@ name: loft sources: - https://github.com/loft-sh/loft type: application -version: 3.0.2 +version: 3.1.1 diff --git a/charts/loft/loft/values.yaml b/charts/loft/loft/values.yaml index 9001bd806..bbf10e26d 100644 --- a/charts/loft/loft/values.yaml +++ b/charts/loft/loft/values.yaml @@ -21,7 +21,7 @@ ingress: path: / tls: enabled: true - secret: tls-loft + secret: loft-tls clusterIssuer: lets-encrypt-http-issuer # TLS configuration with a custom cert and key diff --git a/charts/new-relic/nri-bundle/Chart.lock b/charts/new-relic/nri-bundle/Chart.lock index cd647f0d4..6d10a0957 100644 --- a/charts/new-relic/nri-bundle/Chart.lock +++ b/charts/new-relic/nri-bundle/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: newrelic-infrastructure repository: https://newrelic.github.io/nri-kubernetes - version: 3.15.0 + version: 3.16.0 - name: nri-prometheus repository: https://newrelic.github.io/nri-prometheus version: 2.1.16 @@ -10,7 +10,7 @@ dependencies: version: 1.1.1 - name: nri-metadata-injection repository: https://newrelic.github.io/k8s-metadata-injection - version: 4.2.1 + version: 4.3.0 - name: newrelic-k8s-metrics-adapter repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter version: 1.1.2 @@ -31,6 +31,6 @@ dependencies: version: 0.1.0 - name: newrelic-infra-operator repository: https://newrelic.github.io/newrelic-infra-operator - version: 2.1.2 -digest: sha256:45bf374ce1426fd12e234bbf7da5f570865db08874f1e48c54647c3791be6140 -generated: "2023-04-13T01:24:43.126621604Z" + version: 2.2.0 +digest: sha256:72be376e152cc33d571e1e18c2fae0094fe681dfd712b5832d7e50d0d3904f0b +generated: "2023-05-04T02:02:46.45299591Z" diff --git a/charts/new-relic/nri-bundle/Chart.yaml b/charts/new-relic/nri-bundle/Chart.yaml index 740dc32d2..f9051ba97 100644 --- a/charts/new-relic/nri-bundle/Chart.yaml +++ b/charts/new-relic/nri-bundle/Chart.yaml @@ -7,7 +7,7 @@ dependencies: - condition: infrastructure.enabled,newrelic-infrastructure.enabled name: newrelic-infrastructure repository: file://./charts/newrelic-infrastructure - version: 3.15.0 + version: 3.16.0 - condition: prometheus.enabled,nri-prometheus.enabled name: nri-prometheus repository: file://./charts/nri-prometheus @@ -19,7 +19,7 @@ dependencies: - condition: webhook.enabled,nri-metadata-injection.enabled name: nri-metadata-injection repository: file://./charts/nri-metadata-injection - version: 4.2.1 + version: 4.3.0 - condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled name: newrelic-k8s-metrics-adapter repository: file://./charts/newrelic-k8s-metrics-adapter @@ -48,7 +48,7 @@ dependencies: - condition: newrelic-infra-operator.enabled name: newrelic-infra-operator repository: file://./charts/newrelic-infra-operator - version: 2.1.2 + version: 2.2.0 description: Groups together the individual charts for the New Relic Kubernetes solution for a more comfortable deployment. home: https://github.com/newrelic/helm-charts @@ -89,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.11 +version: 5.0.12 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 f36be0363..76bc2c7fb 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,5 +1,5 @@ apiVersion: v2 -appVersion: 0.9.0 +appVersion: 0.10.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com @@ -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.1.2 +version: 2.2.0 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml index 62b980ff5..78f1b1f6a 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml @@ -7,12 +7,17 @@ release: tests: - it: If PSPs are enabled PodSecurityPolicy is rendered set: + cluster: test-cluster + licenseKey: use-whatever rbac: pspEnabled: true asserts: - hasDocuments: count: 1 - it: If PSPs are disabled PodSecurityPolicy isn't rendered + set: + cluster: test-cluster + licenseKey: use-whatever asserts: - hasDocuments: count: 0 diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml index db6f595a3..2ab9f137b 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml @@ -8,6 +8,8 @@ release: tests: - it: RBAC points to the service account that is created by default set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: true asserts: @@ -17,6 +19,8 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: false serviceAccount.name: sa-test @@ -27,6 +31,8 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: false asserts: diff --git a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/rbac_test.yaml index ed5e08e3b..03473cb39 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/rbac_test.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infra-operator/tests/rbac_test.yaml @@ -8,6 +8,8 @@ release: tests: - it: RBAC points to the service account that is created by default set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: true asserts: @@ -17,6 +19,8 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: false serviceAccount.name: sa-test @@ -27,6 +31,8 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster + licenseKey: use-whatever rbac.create: true serviceAccount.create: false asserts: 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 d37be39e5..676d12c6d 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 @@ -140,7 +140,7 @@ config: # @default -- See `values.yaml` image: repository: newrelic/infrastructure-k8s - tag: 2.13.6-unprivileged + tag: 2.13.7-unprivileged pullPolicy: IfNotPresent # -- configSelectors is the way to configure resource requirements and extra envVars of the injected sidecar container. 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 422e11e59..344beb12e 100644 --- a/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml +++ b/charts/new-relic/nri-bundle/charts/newrelic-infrastructure/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 3.10.0 +appVersion: 3.11.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com @@ -35,4 +35,4 @@ 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.15.0 +version: 3.16.0 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 53e56f215..0bee842d4 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.40.0 + tag: 1.40.1 pullPolicy: IfNotPresent # -- Image for the New Relic Infrastructure Agent plus integrations. # @default -- See `values.yaml` agent: registry: "" repository: newrelic/infrastructure-bundle - tag: 3.1.5 + tag: 3.1.8 pullPolicy: IfNotPresent # -- Image for the New Relic Kubernetes integration. # @default -- See `values.yaml` 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 768a7772e..ca75bdfcb 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,5 +1,5 @@ apiVersion: v2 -appVersion: 1.9.0 +appVersion: 1.10.0 dependencies: - name: common-library repository: https://helm-charts.newrelic.com @@ -34,4 +34,4 @@ 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.2.1 +version: 4.3.0 diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml index 08903a33c..42bf2d360 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml @@ -8,6 +8,7 @@ release: tests: - it: RBAC points to the service account that is created by default set: + cluster: test-cluster rbac.create: true serviceAccount.create: true asserts: @@ -17,6 +18,7 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster rbac.create: true serviceAccount.create: false serviceAccount.name: sa-test @@ -27,6 +29,7 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster rbac.create: true serviceAccount.create: false asserts: diff --git a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/rbac_test.yaml index c6cc3888c..5a69191df 100644 --- a/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/rbac_test.yaml +++ b/charts/new-relic/nri-bundle/charts/nri-metadata-injection/tests/rbac_test.yaml @@ -8,6 +8,7 @@ release: tests: - it: RBAC points to the service account that is created by default set: + cluster: test-cluster rbac.create: true serviceAccount.create: true asserts: @@ -17,6 +18,7 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster rbac.create: true serviceAccount.create: false serviceAccount.name: sa-test @@ -27,6 +29,7 @@ tests: - it: RBAC points to the service account the user supplies when serviceAccount is disabled set: + cluster: test-cluster rbac.create: true serviceAccount.create: false asserts: diff --git a/charts/redpanda/redpanda/Chart.yaml b/charts/redpanda/redpanda/Chart.yaml index c007a961b..0db57ea65 100644 --- a/charts/redpanda/redpanda/Chart.yaml +++ b/charts/redpanda/redpanda/Chart.yaml @@ -31,4 +31,4 @@ name: redpanda sources: - https://github.com/redpanda-data/helm-charts type: application -version: 4.0.15 +version: 4.0.16 diff --git a/charts/redpanda/redpanda/ci/21-eks-tiered-storage-with-creds-values.yaml.tpl b/charts/redpanda/redpanda/ci/21-eks-tiered-storage-with-creds-values.yaml.tpl new file mode 100644 index 000000000..943079cca --- /dev/null +++ b/charts/redpanda/redpanda/ci/21-eks-tiered-storage-with-creds-values.yaml.tpl @@ -0,0 +1,10 @@ +storage: + tieredConfig: + cloud_storage_enabled: true + cloud_storage_credentials_source: config_file + cloud_storage_access_key: "${AWS_ACCESS_KEY_ID}" + cloud_storage_secret_key: "${AWS_SECRET_ACCESS_KEY}" + cloud_storage_region: "${AWS_REGION}" + cloud_storage_bucket: "${TEST_BUCKET}" + cloud_storage_segment_max_upload_interval_sec: 1 +license_key: "${REDPANDA_SAMPLE_LICENSE}" \ No newline at end of file diff --git a/charts/redpanda/redpanda/templates/tests/test-kafka-produce-consume.yaml b/charts/redpanda/redpanda/templates/tests/test-kafka-produce-consume.yaml index eb58fd8e3..d1bcc3fe5 100644 --- a/charts/redpanda/redpanda/templates/tests/test-kafka-produce-consume.yaml +++ b/charts/redpanda/redpanda/templates/tests/test-kafka-produce-consume.yaml @@ -16,7 +16,6 @@ limitations under the License. */}} {{- $sasl := .Values.auth.sasl }} {{- $root := deepCopy . }} -{{- $useSaslSecret := and $sasl.enabled (not (empty $sasl.secretRef )) }} apiVersion: v1 kind: Pod metadata: @@ -51,11 +50,19 @@ spec: - -c - | set -e +{{- $cloudStorageFlags := "" }} +{{- if and (include "is-licensed" . | fromJson).bool .Values.storage.tieredConfig.cloud_storage_enabled }} + {{- $cloudStorageFlags = "-c retention.bytes=80 -c segment.bytes=40 -c redpanda.remote.read=true -c redpanda.remote.write=true"}} +{{- end }} +{{- $useSaslSecret := and $sasl.enabled (not (empty $sasl.secretRef )) }} {{- if or (not $sasl.enabled) $useSaslSecret }} - until rpk topic create produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" . }} + until rpk topic create produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" . }} {{ $cloudStorageFlags }} do sleep 2 done - echo "Pandas are awesome!" | rpk topic produce produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" . }} + {{- range $i := until 100 }} + echo "Pandas are awesome!" | rpk topic produce produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" $ }} + {{- end }} + sleep 2 rpk topic consume produce.consume.test.$POD_NAME -n 1 {{ include "rpk-topic-flags" . }} | grep "Pandas are awesome!" rpk topic delete produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" . }} {{- end }} diff --git a/index.yaml b/index.yaml index 7a829c88b..0a14928bc 100644 --- a/index.yaml +++ b/index.yaml @@ -961,6 +961,42 @@ entries: - assets/ambassador/ambassador-6.7.1100.tgz version: 6.7.1100 argo-cd: + - annotations: + artifacthub.io/changes: | + - kind: added + description: Enable to customize Service type of applicationset-controller + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Argo CD + catalog.cattle.io/kube-version: '>=1.22.0-0' + catalog.cattle.io/release-name: argo-cd + apiVersion: v2 + appVersion: v2.7.1 + created: "2023-05-08T19:55:44.378446909Z" + dependencies: + - condition: redis-ha.enabled + name: redis-ha + repository: file://./charts/redis-ha + version: 4.22.5 + description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery + tool for Kubernetes. + digest: 3bafc90149c37d153b7ef9878171fb131094eb6e4ece6a510e10abd9dfd0f32a + home: https://github.com/argoproj/argo-helm + icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png + keywords: + - argoproj + - argocd + - gitops + kubeVersion: '>=1.22.0-0' + maintainers: + - name: argoproj + url: https://argoproj.github.io/ + name: argo-cd + sources: + - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd + - https://github.com/argoproj/argo-cd + urls: + - assets/argo/argo-cd-5.32.1.tgz + version: 5.32.1 - annotations: artifacthub.io/changes: | - kind: changed @@ -2609,6 +2645,39 @@ entries: - assets/argo/argo-cd-5.8.0.tgz version: 5.8.0 artifactory-ha: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: JFrog Artifactory HA + catalog.cattle.io/kube-version: '>= 1.14.0-0' + catalog.cattle.io/release-name: artifactory-ha + apiVersion: v2 + appVersion: 7.55.13 + created: "2023-05-08T19:55:59.681575427Z" + dependencies: + - condition: postgresql.enabled + name: postgresql + repository: file://./charts/postgresql + version: 10.3.18 + description: Universal Repository Manager supporting all major packaging formats, + build tools and CI servers. + digest: 6cd90ae247aa95a7d4fd7621e46d7b566ba36085996393c6cef39cc01b543ca1 + home: https://www.jfrog.com/artifactory/ + icon: https://raw.githubusercontent.com/jfrog/charts/ea5c3112c24a973f64f3ccd99747323db292a369/stable/artifactory-ha/logo/artifactory-logo.png + keywords: + - artifactory + - jfrog + - devops + kubeVersion: '>= 1.14.0-0' + maintainers: + - email: installers@jfrog.com + name: Chart Maintainers at JFrog + name: artifactory-ha + sources: + - https://github.com/jfrog/charts + type: application + urls: + - assets/jfrog/artifactory-ha-107.55.13.tgz + version: 107.55.13 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: JFrog Artifactory HA @@ -3362,6 +3431,40 @@ entries: - assets/jfrog/artifactory-ha-3.0.1400.tgz version: 3.0.1400 artifactory-jcr: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: JFrog Container Registry + catalog.cattle.io/kube-version: '>= 1.14.0-0' + catalog.cattle.io/release-name: artifactory-jcr + apiVersion: v2 + appVersion: 7.55.13 + created: "2023-05-08T19:55:59.923102664Z" + dependencies: + - name: artifactory + repository: file://./charts/artifactory + version: 107.55.13 + description: JFrog Container Registry + digest: 593969c4a43ebf0b6567fc7a0187c19414f26ae7dea903ca10a6cf2087323231 + home: https://jfrog.com/container-registry/ + icon: https://raw.githubusercontent.com/jfrog/charts/ea5c3112c24a973f64f3ccd99747323db292a369/stable/artifactory-jcr/logo/jcr-logo.png + keywords: + - artifactory + - jfrog + - container + - registry + - devops + - jfrog-container-registry + kubeVersion: '>= 1.14.0-0' + maintainers: + - email: helm@jfrog.com + name: Chart Maintainers at JFrog + name: artifactory-jcr + sources: + - https://github.com/jfrog/charts + type: application + urls: + - assets/jfrog/artifactory-jcr-107.55.13.tgz + version: 107.55.13 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: JFrog Container Registry @@ -4108,6 +4211,71 @@ entries: - assets/jfrog/artifactory-jcr-2.5.100.tgz version: 2.5.100 asserts: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Asserts + catalog.cattle.io/kube-version: '>=1.17-0' + catalog.cattle.io/release-name: asserts + apiVersion: v2 + created: "2023-05-08T19:55:44.768639089Z" + dependencies: + - condition: knowledge-sensor.enabled + name: knowledge-sensor + repository: file://./charts/knowledge-sensor + version: 1.1.0 + - alias: tsdb + condition: tsdb.enabled + name: victoria-metrics-single + repository: file://./charts/victoria-metrics-single + version: 1.1.0 + - condition: alertmanager.enabled + name: alertmanager + repository: file://./charts/alertmanager + version: 1.0.0 + - alias: promxyruler + condition: promxyruler.enabled + name: promxy + repository: file://./charts/promxy + version: 0.8.0 + - alias: promxyuser + condition: promxyuser.enabled + name: promxy + repository: file://./charts/promxy + version: 0.8.0 + - alias: ebpfProbe + condition: ebpfProbe.enabled + name: ebpf-probe + repository: file://./charts/ebpf-probe + version: 0.6.0 + - name: common + repository: file://./charts/common + version: 1.x.x + - alias: redisgraph + condition: redisgraph.enabled + name: redis + repository: file://./charts/redis + version: 16.13.2 + - alias: redisearch + condition: redisearch.enabled + name: redis + repository: file://./charts/redis + version: 16.13.2 + - alias: postgres + condition: postgres.enabled + name: postgresql + repository: file://./charts/postgresql + version: 11.9.13 + description: Asserts Helm Chart to configure entire asserts stack + digest: fa3496f4f44b66c65036a3c483efc2f5457d3148fee4a454bb4d3ce3870ab0bf + icon: https://www.asserts.ai/favicon.png + maintainers: + - name: Asserts + url: https://github.com/asserts + name: asserts + type: application + urls: + - assets/asserts/asserts-1.38.0.tgz + version: 1.38.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Asserts @@ -7054,6 +7222,27 @@ entries: - assets/cloudcasa/cloudcasa-0.1.000.tgz version: 0.1.000 cockroachdb: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: CockroachDB + catalog.cattle.io/kube-version: '>=1.8-0' + catalog.cattle.io/release-name: cockroachdb + apiVersion: v1 + appVersion: 22.2.9 + created: "2023-05-08T19:55:46.507511746Z" + description: CockroachDB is a scalable, survivable, strongly-consistent SQL database. + digest: 2e9dd213f6816ea4acc7c680ecfe3724e89bd530ad2d08cc6b1a0bd311471147 + home: https://www.cockroachlabs.com + icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png + maintainers: + - email: helm-charts@cockroachlabs.com + name: cockroachlabs + name: cockroachdb + sources: + - https://github.com/cockroachdb/cockroach + urls: + - assets/cockroach-labs/cockroachdb-10.0.9.tgz + version: 10.0.9 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: CockroachDB @@ -8003,8 +8192,8 @@ entries: catalog.cattle.io/featured: "2" catalog.cattle.io/release-name: cost-analyzer apiVersion: v2 - appVersion: 1.102.2 - created: "2023-04-18T16:31:59.071091284Z" + appVersion: 1.103.1 + created: "2023-05-08T19:56:19.116161045Z" dependencies: - condition: global.grafana.enabled name: grafana @@ -8020,7 +8209,38 @@ entries: version: ~0.29.0 description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor cloud costs. - digest: 0f0bdbe65abb0b93f72d9f68a833ccb5a5bba66d13802220cc6b862715d2881e + digest: 4f7f61b170d1adc832d7a9323d85f69fd841ff6de9c7f0491c7fa240abd8b307 + icon: https://partner-charts.rancher.io/assets/logos/kubecost.png + name: cost-analyzer + urls: + - assets/kubecost/cost-analyzer-1.103.1.tgz + version: 1.103.1 + - annotations: + artifacthub.io/links: | + - name: Homepage + url: https://www.kubecost.com + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Kubecost + catalog.cattle.io/release-name: cost-analyzer + apiVersion: v2 + appVersion: 1.102.2 + created: "2023-05-08T19:56:09.474568466Z" + dependencies: + - condition: global.grafana.enabled + name: grafana + repository: file://./charts/grafana + version: ~1.17.2 + - condition: global.prometheus.enabled + name: prometheus + repository: file://./charts/prometheus + version: ~11.0.2 + - condition: global.thanos.enabled + name: thanos + repository: file://./charts/thanos + version: ~0.29.0 + description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor + cloud costs. + digest: becc1ef9d7f854cddcc845c563dc3a06e859927ef6ac714ff9406940f2d48a04 icon: https://partner-charts.rancher.io/assets/logos/kubecost.png name: cost-analyzer urls: @@ -8370,6 +8590,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.27.0 + created: "2023-05-08T19:55:46.599822632Z" + dependencies: + - condition: crate-operator-crds.enabled + name: crate-operator-crds + repository: file://./charts/crate-operator-crds + version: 2.27.0 + description: Crate Operator - Helm chart for installing and upgrading Crate Operator. + digest: 234438ce5f0336349b1b5c617272703043983f3f31d9ff4ada7a13152be5eeea + 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.27.0.tgz + version: 2.27.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: CrateDB Operator @@ -12186,6 +12428,74 @@ 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.11.2 + created: "2023-05-08T19:55:58.397697315Z" + 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.1 + - 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: '*.*.*' + - condition: gitlab-zoekt.install + name: gitlab-zoekt + repository: https://charts.gitlab.io/ + version: 0.3.0 + description: The One DevOps Platform + digest: f07f3cf01cf06ffebd81d4ff30787c9a93374d7d757fd36055a819835064da1a + 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.11.2.tgz + version: 6.11.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: GitLab @@ -17943,8 +18253,8 @@ entries: catalog.cattle.io/kube-version: '>= 1.17.0-0' catalog.cattle.io/release-name: k10 apiVersion: v2 - appVersion: 5.5.9 - created: "2023-04-24T15:36:32.666550575Z" + appVersion: 5.5.10 + created: "2023-05-08T19:56:09.120861974Z" dependencies: - name: grafana repository: file://./charts/grafana @@ -17953,7 +18263,33 @@ entries: repository: file://./charts/prometheus version: 15.8.5 description: Kasten’s K10 Data Management Platform - digest: e6468182bcc3e2d1feee91fbd6c5968f9fe5413af8b7485fbfa4e62516c9ef63 + digest: a62f003fa5c12b256c08d38837dceafa33b22284ca4e3b84e555d0df11fdbce4 + home: https://kasten.io/ + icon: https://docs.kasten.io/_static/logo-kasten-k10-blue-white.png + maintainers: + - email: contact@kasten.io + name: kastenIO + name: k10 + urls: + - assets/kasten/k10-5.5.1001.tgz + version: 5.5.1001 + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: K10 + catalog.cattle.io/kube-version: '>= 1.17.0-0' + catalog.cattle.io/release-name: k10 + apiVersion: v2 + appVersion: 5.5.9 + created: "2023-05-08T19:56:00.376567878Z" + dependencies: + - name: grafana + repository: file://./charts/grafana + version: 6.32.9 + - name: prometheus + repository: file://./charts/prometheus + version: 15.8.5 + description: Kasten’s K10 Data Management Platform + digest: 3b25967ca991c41b3a0e04edbce0e606dd842a901ccf368ef68921dd0caa0d99 home: https://kasten.io/ icon: https://docs.kasten.io/_static/logo-kasten-k10-blue-white.png maintainers: @@ -20954,6 +21290,41 @@ entries: - assets/linkerd/linkerd2-2.11.0.tgz version: 2.11.0 loft: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Loft + catalog.cattle.io/kube-version: '>=1.22-0' + catalog.cattle.io/release-name: loft + apiVersion: v2 + created: "2023-05-08T19:56:19.221594685Z" + description: Secure Cluster Sharing, Self-Service Namespace Provisioning and Virtual + Clusters + digest: 1ab4a366255df08f79f61a52d3f037e0fc70362863531b834ae21e72b89bfa68 + home: https://loft.sh + icon: https://static.loft.sh/loft/logo/loft-logo.svg + keywords: + - developer + - development + - sharing + - share + - multi-tenancy + - tenancy + - cluster + - space + - namespace + - vcluster + - vclusters + maintainers: + - email: info@loft.sh + name: Loft Labs, Inc. + url: https://twitter.com/loft_sh + name: loft + sources: + - https://github.com/loft-sh/loft + type: application + urls: + - assets/loft/loft-3.1.1.tgz + version: 3.1.1 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Loft @@ -23430,10 +23801,36 @@ entries: catalog.cattle.io/kube-version: '>= 1.22.0-0' catalog.cattle.io/release-name: nginx-ingress apiVersion: v2 - appVersion: 3.1.0 - created: "2023-03-28T14:00:41.07218618Z" + appVersion: 3.1.1 + created: "2023-05-08T19:55:58.069331722Z" description: NGINX Ingress Controller - digest: 858fd86f381e90023f751f7d45a8fb31c0d55710c3ea579eb3cc2e437439fb6b + digest: 0f3303951516b1a70cc367b7e1fd991783313aec400192688684a4f68a15e212 + home: https://github.com/nginxinc/kubernetes-ingress + icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.1/deployments/helm-chart/chart-icon.png + keywords: + - ingress + - nginx + kubeVersion: '>= 1.22.0-0' + maintainers: + - email: kubernetes@nginx.com + name: nginxinc + name: nginx-ingress + sources: + - https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.1/deployments/helm-chart + type: application + urls: + - assets/f5/nginx-ingress-0.17.1.tgz + version: 0.17.1 + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: NGINX Ingress Controller + catalog.cattle.io/kube-version: '>= 1.22.0-0' + catalog.cattle.io/release-name: nginx-ingress + apiVersion: v2 + appVersion: 3.1.0 + created: "2023-05-08T19:55:47.041410808Z" + description: NGINX Ingress Controller + digest: d20e1e21a630235b4e4e9a2d150c6648534509528732ff4310a368f2484858af home: https://github.com/nginxinc/kubernetes-ingress icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.1.0/deployments/helm-chart/chart-icon.png keywords: @@ -23849,6 +24246,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-05-08T19:56:19.348149694Z" + dependencies: + - condition: infrastructure.enabled,newrelic-infrastructure.enabled + name: newrelic-infrastructure + repository: file://./charts/newrelic-infrastructure + version: 3.16.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.3.0 + - 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.4 + - 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.1.0 + - condition: newrelic-infra-operator.enabled + name: newrelic-infra-operator + repository: file://./charts/newrelic-infra-operator + version: 2.2.0 + description: Groups together the individual charts for the New Relic Kubernetes + solution for a more comfortable deployment. + digest: e6eff79634ae47570364119888740610ba2b419ed80aa95eb13b7fe330b0d8d7 + 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.12.tgz + version: 5.0.12 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: New Relic @@ -27688,6 +28181,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.11 + created: "2023-05-08T19:55:45.658225197Z" + 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: d0e150d2f2fbf6f60fe29c5efb7e018bdc6ff9fb3c0134c815d6ac6c761e2b34 + 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.10.2.tgz + version: 17.10.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Redis @@ -28656,6 +29184,44 @@ entries: - assets/bitnami/redis-17.3.7.tgz version: 17.3.7 redpanda: + - annotations: + artifacthub.io/images: | + - name: redpanda + image: vectorized/redpanda:v23.1.8 + - name: busybox + image: busybox:latest + artifacthub.io/license: Apache-2.0 + artifacthub.io/links: | + - name: Documentation + url: https://docs.redpanda.com + - name: "Helm (>= 3.6.0)" + url: https://helm.sh/docs/intro/install/ + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Redpanda + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: redpanda + apiVersion: v2 + appVersion: v23.1.8 + created: "2023-05-08T19:56:19.906597194Z" + dependencies: + - condition: console.enabled + name: console + repository: file://./charts/console + version: '>=0.5 <1.0' + description: Redpanda is the real-time engine for modern apps. + digest: 1c382f85f2e620d89cf0768d7c23e0f557223e27e52cd56cc5c2c370bccd2e04 + icon: https://images.ctfassets.net/paqvtpyf8rwu/3cYHw5UzhXCbKuR24GDFGO/73fb682e6157d11c10d5b2b5da1d5af0/skate-stand-panda.svg + kubeVersion: '>=1.21-0' + maintainers: + - name: redpanda-data + url: https://github.com/orgs/redpanda-data/people + name: redpanda + sources: + - https://github.com/redpanda-data/helm-charts + type: application + urls: + - assets/redpanda/redpanda-4.0.16.tgz + version: 4.0.16 - annotations: artifacthub.io/images: | - name: redpanda @@ -30910,6 +31476,41 @@ entries: - assets/shipa/shipa-1.4.0.tgz version: 1.4.0 spark: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Spark + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: spark + category: Infrastructure + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 3.3.2 + created: "2023-05-08T19:55:45.873169551Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Spark is a high-performance engine for large-scale computing + tasks, such as data processing, machine learning and real-time data streaming. + It includes APIs for Java, Python, Scala and R. + digest: 78c3cfcd795c113eeeda11e89708f9f7c92532c4a6580669e27b43202ef27acd + home: https://github.com/bitnami/charts/tree/main/bitnami/spark + icon: https://www.apache.org/logos/res/spark/default.png + keywords: + - apache + - spark + maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts + name: spark + sources: + - https://github.com/bitnami/containers/tree/main/bitnami/spark + - https://spark.apache.org/ + urls: + - assets/bitnami/spark-6.5.2.tgz + version: 6.5.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Spark