From cb1ae1ddfdb3a1c9cdc8f1a3311d13fab04009f0 Mon Sep 17 00:00:00 2001 From: Junaid Chaudry Date: Tue, 6 Jun 2023 17:59:03 -0400 Subject: [PATCH 1/2] Adding support for extraManifests for the chart --- jupyterhub/templates/extraManifests.yaml | 4 ++++ jupyterhub/values.schema.yaml | 5 +++++ jupyterhub/values.yaml | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 jupyterhub/templates/extraManifests.yaml diff --git a/jupyterhub/templates/extraManifests.yaml b/jupyterhub/templates/extraManifests.yaml new file mode 100644 index 0000000000..2855904ec7 --- /dev/null +++ b/jupyterhub/templates/extraManifests.yaml @@ -0,0 +1,4 @@ +{{ range .Values.extraObjects }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} \ No newline at end of file diff --git a/jupyterhub/values.schema.yaml b/jupyterhub/values.schema.yaml index 51324ebeb9..a9bb7f4af8 100644 --- a/jupyterhub/values.schema.yaml +++ b/jupyterhub/values.schema.yaml @@ -2925,3 +2925,8 @@ properties: A flag that should only be set to true temporarily when experiencing a deprecation message that contain censored content that you wish to reveal. + + extraObjects: + type: array + description: | + Any additional K8s manifests to deploy with the chart \ No newline at end of file diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml index 96dd9bb714..c41305429c 100644 --- a/jupyterhub/values.yaml +++ b/jupyterhub/values.yaml @@ -659,3 +659,26 @@ debug: global: safeToShowValues: false + +# -- Array of extra K8s manifests to deploy +extraObjects: [] + # example: + # - apiVersion: secrets-store.csi.x-k8s.io/v1 + # kind: SecretProviderClass + # metadata: + # name: singleuser-hub-secrets-store + # spec: + # provider: aws + # parameters: + # objects: | + # - objectName: "singleuser-secret" + # objectType: "secretsmanager" + # jmesPath: + # - path: "somevar" + # objectAlias: "somevalue" + # secretObjects: + # - data: + # - key: somevalue + # objectName: somevalue + # secretName: singleuser-secret + # type: Opaque \ No newline at end of file From 8e55b2f748d8013428fec7f19bb8d72664448a4b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 13:48:51 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- jupyterhub/values.schema.yaml | 4 ++-- jupyterhub/values.yaml | 40 +++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jupyterhub/values.schema.yaml b/jupyterhub/values.schema.yaml index a9bb7f4af8..6b0324352f 100644 --- a/jupyterhub/values.schema.yaml +++ b/jupyterhub/values.schema.yaml @@ -2926,7 +2926,7 @@ properties: deprecation message that contain censored content that you wish to reveal. - extraObjects: + extraObjects: type: array description: | - Any additional K8s manifests to deploy with the chart \ No newline at end of file + Any additional K8s manifests to deploy with the chart diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml index c41305429c..57b494a71a 100644 --- a/jupyterhub/values.yaml +++ b/jupyterhub/values.yaml @@ -662,23 +662,23 @@ global: # -- Array of extra K8s manifests to deploy extraObjects: [] - # example: - # - apiVersion: secrets-store.csi.x-k8s.io/v1 - # kind: SecretProviderClass - # metadata: - # name: singleuser-hub-secrets-store - # spec: - # provider: aws - # parameters: - # objects: | - # - objectName: "singleuser-secret" - # objectType: "secretsmanager" - # jmesPath: - # - path: "somevar" - # objectAlias: "somevalue" - # secretObjects: - # - data: - # - key: somevalue - # objectName: somevalue - # secretName: singleuser-secret - # type: Opaque \ No newline at end of file + # example: + # - apiVersion: secrets-store.csi.x-k8s.io/v1 + # kind: SecretProviderClass + # metadata: + # name: singleuser-hub-secrets-store + # spec: + # provider: aws + # parameters: + # objects: | + # - objectName: "singleuser-secret" + # objectType: "secretsmanager" + # jmesPath: + # - path: "somevar" + # objectAlias: "somevalue" + # secretObjects: + # - data: + # - key: somevalue + # objectName: somevalue + # secretName: singleuser-secret + # type: Opaque