From 566decd874d6dd32cfd4a013fd602aa1a094787c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20B=C5=82aszczyk?= Date: Fri, 11 Oct 2024 12:48:16 +0200 Subject: [PATCH] fix: pin ory ci to 0.3.4 (#710) --- .deps/helm-docs.yaml | 6 ++++-- Makefile | 3 ++- helm/charts/example-idp/README.md | 2 +- helm/charts/hydra-maester/README.md | 2 +- helm/charts/hydra/README.md | 2 +- helm/charts/keto/README.md | 2 +- helm/charts/kratos-selfservice-ui-node/README.md | 2 +- helm/charts/kratos/README.md | 2 +- helm/charts/oathkeeper-maester/README.md | 2 +- helm/charts/oathkeeper/README.md | 2 +- package-lock.json | 13 +++++++------ 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.deps/helm-docs.yaml b/.deps/helm-docs.yaml index e99bd82062..dbb2de14a5 100644 --- a/.deps/helm-docs.yaml +++ b/.deps/helm-docs.yaml @@ -1,5 +1,7 @@ -version: 1.13.1 -url: https://github.com/norwoodj/helm-docs/releases/download/v{{.Version}}/helm-docs_{{.Version}}_{{.Os}}_{{.Architecture}}.tar.gz +version: v1.14.2 +url: | + https://github.com/norwoodj/helm-docs/releases/download/{{.Version}}/helm-docs_{{slice + .Version 1}}_{{.Os}}_{{.Architecture}}.tar.gz mappings: architecture: amd64: "x86_64" diff --git a/Makefile b/Makefile index 5c1d4533bf..6de4388b36 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ export K3SIMAGE := docker.io/rancher/k3s:v1.29.4-k3s1 HELM_INSTALL_DIR=.bin bash <(curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3) -v v3.12.0 --no-sudo .bin/ory: Makefile - curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory + # pin to version v0.3.4 due to a bug in validation + curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory v0.3.4 touch .bin/ory .bin/goimports: diff --git a/helm/charts/example-idp/README.md b/helm/charts/example-idp/README.md index 30d670c6a4..53d65f363d 100644 --- a/helm/charts/example-idp/README.md +++ b/helm/charts/example-idp/README.md @@ -36,4 +36,4 @@ A Helm chart for deploying the reference implementation for the User Login and C | topologySpreadConstraints | list | `[]` | Configure pod topologySpreadConstraints. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/hydra-maester/README.md b/helm/charts/hydra-maester/README.md index 76873f9a98..096d878201 100644 --- a/helm/charts/hydra-maester/README.md +++ b/helm/charts/hydra-maester/README.md @@ -63,4 +63,4 @@ A Helm chart for Kubernetes | singleNamespaceMode | bool | `false` | Single namespace mode. If enabled the controller will watch for resources only from namespace it is deployed in, ignoring others | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/hydra/README.md b/helm/charts/hydra/README.md index 6627c56a75..660da42d9c 100644 --- a/helm/charts/hydra/README.md +++ b/helm/charts/hydra/README.md @@ -204,4 +204,4 @@ A Helm chart for deploying ORY Hydra in Kubernetes | watcher.watchLabelKey | string | `"ory.sh/watcher"` | Label key used for managing applications | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/keto/README.md b/helm/charts/keto/README.md index 07fabd6344..a3b27bb2d9 100644 --- a/helm/charts/keto/README.md +++ b/helm/charts/keto/README.md @@ -184,4 +184,4 @@ Access Control Policies as a Server | watcher.watchLabelKey | string | `"ory.sh/watcher"` | Label key used for managing applications | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/kratos-selfservice-ui-node/README.md b/helm/charts/kratos-selfservice-ui-node/README.md index c4cd4618fd..c903b6812c 100644 --- a/helm/charts/kratos-selfservice-ui-node/README.md +++ b/helm/charts/kratos-selfservice-ui-node/README.md @@ -74,4 +74,4 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | test.busybox | object | `{"repository":"busybox","tag":1}` | use a busybox image from another repository | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/kratos/README.md b/helm/charts/kratos/README.md index bf37127cab..3a85c05114 100644 --- a/helm/charts/kratos/README.md +++ b/helm/charts/kratos/README.md @@ -221,4 +221,4 @@ A ORY Kratos Helm chart for Kubernetes | watcher.watchLabelKey | string | `"ory.sh/watcher"` | Label key used for managing applications | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/oathkeeper-maester/README.md b/helm/charts/oathkeeper-maester/README.md index e45a481a8b..050dab7b4d 100644 --- a/helm/charts/oathkeeper-maester/README.md +++ b/helm/charts/oathkeeper-maester/README.md @@ -68,4 +68,4 @@ A Helm chart for deploying ORY Oathkeeper Rule Controller in Kubernetes | singleNamespaceMode | bool | `false` | Single namespace mode. If enabled the controller will watch for resources only from namespace it is deployed in, ignoring others | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/helm/charts/oathkeeper/README.md b/helm/charts/oathkeeper/README.md index 6c88cc742b..e25aa257b9 100644 --- a/helm/charts/oathkeeper/README.md +++ b/helm/charts/oathkeeper/README.md @@ -152,4 +152,4 @@ A Helm chart for deploying ORY Oathkeeper in Kubernetes | test.labels | object | `{}` | Provide additional labels to the test pod | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/package-lock.json b/package-lock.json index d0f65a6fca..dc59ed4eee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "k8s", "devDependencies": { "license-checker": "^25.0.1", "ory-prettier-styles": "1.3.0", @@ -453,9 +454,9 @@ } }, "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -959,9 +960,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "slide": {