From 1b39356d08c73b7c56adfddb0867689e0837df7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 27 Sep 2023 11:24:19 +0200 Subject: [PATCH 1/2] Update to c2cciutils version 1.6 (CI updates) This is done by the automated script named upgrade-c2cciutils-to-1.7 --- .github/renovate.json5 | 6 +++--- .github/workflows/changelog.yaml | 3 +++ .pre-commit-config.yaml | 8 ++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 4162d6e..11e4e7e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -18,13 +18,13 @@ 'pre-commit': { enabled: true }, regexManagers: [ { - fileMatch: ['^.pre-commit-config.yaml$'], + fileMatch: ['^\\.pre-commit-config\\.yaml$'], matchStrings: [" +- '?(?[^' @=]+)(@|==)(?[^' @=]+)'? # (?.+)"], }, { - fileMatch: ['^ci/config\\\\.yaml$'], + fileMatch: ['^ci/config\\.yaml$'], matchStrings: [ - '.*https://raw\\\\.githubusercontent\\\\.com/(?[^\\\\s]+)/(?[0-9\\\\.]+)/.*', + '.*https://raw\\.githubusercontent\\.com/(?[^\\s]+)/(?[0-9\\.]+)/.*', ], datasourceTemplate: 'github-tags', }, diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index f0941da..a623fb4 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -32,6 +32,9 @@ jobs: ${{ github.repository }} --github-release-update --cache-path=/cache + --skip-from=dependabot-preview[bot] + --skip-from=dependabot[bot] + --skip-from=renovate[bot] -v env: AEON_AUTOMATION_GH_TOKEN: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4497972..014d348 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -107,3 +107,11 @@ repos: hooks: - id: jsonschema-validator files: ^ci/config\.yaml$ + - repo: https://github.com/mheap/json-schema-spell-checker + rev: master + hooks: + - id: json-schema-spell-checker + files: ^values\.schema\.json$ + args: + - --fields=description,title + - --spelling=.github/spell-ignore-words.txt From 27792c95aa84820afd1eada9c7cb287cd1ee57a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 27 Sep 2023 12:04:06 +0200 Subject: [PATCH 2/2] Fix spell --- .github/spell-ignore-words.txt | 7 +++++++ values.md | 12 ++++++------ values.schema.json | 12 ++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 .github/spell-ignore-words.txt diff --git a/.github/spell-ignore-words.txt b/.github/spell-ignore-words.txt new file mode 100644 index 0000000..7fa008f --- /dev/null +++ b/.github/spell-ignore-words.txt @@ -0,0 +1,7 @@ +fullname +sha +Kubernetes +ConfigMap +valueFrom +mountPath +devicePath diff --git a/values.md b/values.md index 9ed7d52..be44dbf 100644 --- a/values.md +++ b/values.md @@ -12,7 +12,7 @@ - **`serviceName`**: Refer to _[#/definitions/serviceName](#definitions/serviceName)_. - **`releaseTrunc`**: Refer to _[#/definitions/releaseTrunc](#definitions/releaseTrunc)_. - **`prefixTrunc`**: Refer to _[#/definitions/prefixTrunc](#definitions/prefixTrunc)_. -- **`metadata`** _(boolean)_: Create a Config Map to expose some metadata about the chart. +- **`metadata`** _(boolean)_: Create a ConfigMap to expose some metadata about the chart. - **`ingress`** _(object)_: Cannot contain additional properties. - **`enabled`** _(boolean)_: Enable the Ingress. - **`nameOverride`**: Refer to _[#/definitions/nameOverride](#definitions/nameOverride)_. @@ -54,7 +54,7 @@ - **`nodeSelector`**: Refer to _[#/definitions/nodeSelector](#definitions/nodeSelector)_. - **`replicaCount`** _(integer)_: The number of replicas. - **`volumes`** _(object)_: The volumes configuration, the key is the name of the volume. - - **`initContainers`** _(object)_: The init containers configuration. Can contain additional properties. + - **`initContainers`** _(object)_: The initialization containers configuration. Can contain additional properties. - **Additional Properties** _(object)_: Cannot contain additional properties. - **`image`**: Refer to _[#/definitions/image](#definitions/image)_. - **`env`**: Refer to _[#/definitions/env](#definitions/env)_. @@ -79,7 +79,7 @@ - **`ingress`** _(object)_: Cannot contain additional properties. - **`enabled`** _(boolean)_: Enable the ingress for this service. - **`path`** _(string)_: The path of the ingress. - - **`service`** _(object)_: The kubernetes service configuration. Cannot contain additional properties. + - **`service`** _(object)_: The Kubernetes service configuration. Cannot contain additional properties. - **`name`** _(string)_: The name of the service. - **`type`** _(string)_: The type of the service. Default: `"ClusterIP"`. - **`servicePort`** _(integer)_: The port of the service. Default: `80`. @@ -95,7 +95,7 @@ - **`nameOverride`** _(string)_: [helm-common] Override the name. - **`fullnameOverride`** _(string)_: [helm-common] Override the fullname. - **`releaseTrunc`** _(integer)_: [helm-common] The release trunk length. Default: `20`. -- **`prefixTrunc`** _(integer)_: [helm-common] The prefix trunk length (release anf chart name). Default: `40`. +- **`prefixTrunc`** _(integer)_: [helm-common] The prefix trunk length (release and chart name). Default: `40`. - **`serviceAccount`** _(object)_: [helm-common] Service account configuration. Cannot contain additional properties. - **`create`** _(boolean)_: Create a service account. - **`name`** _(string)_: Name of the service account. @@ -104,7 +104,7 @@ - **`globalImage`** _(object)_: [helm-common] global image configuration. Cannot contain additional properties. - **`pullPolicy`** _(string)_: Image pull policy. - **`pullSecrets`** _(array)_: Image pull secrets. -- **`configMapNameOverride`** _(object)_: [helm-common] global: Used to be able to globally override the name of the config map. Can contain additional properties. +- **`configMapNameOverride`** _(object)_: [helm-common] global: Used to be able to globally override the name of the ConfigMap. Can contain additional properties. - **Additional Properties** _(string)_ - **`labels`** _(object)_: [helm-common] Pod labels. Can contain additional properties. - **Additional Properties** _(string)_ @@ -145,7 +145,7 @@ - **`resources`** _(object)_: [helm-common] Container: The container resources. - **`command`** _(array)_: Container: The container command. - **Items** _(string)_ -- **`args`** _(array)_: Container: The container args. +- **`args`** _(array)_: Container: The container arguments. - **Items** _(string)_ - **`volumeMounts`** _(object)_: Container: Volume mounts, the key is the mountPath of the volume. - **`volumeDevices`** _(object)_: Container: Volume devices, the key is the devicePath of the volume. diff --git a/values.schema.json b/values.schema.json index 545c17c..c55f375 100644 --- a/values.schema.json +++ b/values.schema.json @@ -18,7 +18,7 @@ }, "prefixTrunc": { "type": "integer", - "description": "[helm-common] The prefix trunk length (release anf chart name)", + "description": "[helm-common] The prefix trunk length (release and chart name)", "default": 40 }, "serviceAccount": { @@ -61,7 +61,7 @@ }, "configMapNameOverride": { "type": "object", - "description": "[helm-common] global: Used to be able to globally override the name of the config map", + "description": "[helm-common] global: Used to be able to globally override the name of the ConfigMap", "additionalProperties": { "type": "string" } @@ -228,7 +228,7 @@ }, "args": { "type": "array", - "description": "Container: The container args", + "description": "Container: The container arguments", "items": { "type": "string" } }, "volumeMounts": { @@ -275,7 +275,7 @@ }, "metadata": { "type": "boolean", - "description": "Create a Config Map to expose some metadata about the chart" + "description": "Create a ConfigMap to expose some metadata about the chart" }, "ingress": { "type": "object", @@ -418,7 +418,7 @@ }, "initContainers": { "type": "object", - "description": "The init containers configuration", + "description": "The initialization containers configuration", "additionalProperties": { "type": "object", "additionalProperties": false, @@ -509,7 +509,7 @@ }, "service": { "type": "object", - "description": "The kubernetes service configuration", + "description": "The Kubernetes service configuration", "additionalProperties": false, "properties": { "name": {