From 6b9d3c69fa635907c5bbc91a984d005b0322dc3f Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 09:53:35 -0500 Subject: [PATCH 01/14] updated ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 52a8ff81..4acd69ad 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vault.init super-linter.log /archive +ocp-connection.txt From 332332ef8af270f87894f4cfbdab19762cb7bba6 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 09:57:25 -0500 Subject: [PATCH 02/14] updated some operator versions --- values-hub.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index a34db075..fcd4becb 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -27,7 +27,7 @@ clusterGroup: acm: name: advanced-cluster-management namespace: open-cluster-management - channel: release-2.6 + channel: release-2.7 acs: name: rhacs-operator #packageName @@ -37,7 +37,7 @@ clusterGroup: odf: name: odf-operator namespace: openshift-storage - channel: stable-4.10 + channel: stable-4.12 quay: name: quay-operator From 8166f2265aca977b601faa0c342137ff556e74e4 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 10:20:02 -0500 Subject: [PATCH 03/14] added devspaces --- charts/hub/devspaces/.helmignore | 23 ++++++ charts/hub/devspaces/Chart.yaml | 24 ++++++ charts/hub/devspaces/templates/_helpers.tpl | 62 ++++++++++++++ .../templates/devspaces-instance.yaml | 43 ++++++++++ charts/hub/devspaces/values.yaml | 82 +++++++++++++++++++ values-hub.yaml | 13 +++ 6 files changed, 247 insertions(+) create mode 100644 charts/hub/devspaces/.helmignore create mode 100644 charts/hub/devspaces/Chart.yaml create mode 100644 charts/hub/devspaces/templates/_helpers.tpl create mode 100644 charts/hub/devspaces/templates/devspaces-instance.yaml create mode 100644 charts/hub/devspaces/values.yaml diff --git a/charts/hub/devspaces/.helmignore b/charts/hub/devspaces/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/charts/hub/devspaces/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/hub/devspaces/Chart.yaml b/charts/hub/devspaces/Chart.yaml new file mode 100644 index 00000000..e04893f7 --- /dev/null +++ b/charts/hub/devspaces/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: devspaces +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/charts/hub/devspaces/templates/_helpers.tpl b/charts/hub/devspaces/templates/_helpers.tpl new file mode 100644 index 00000000..dbb9600f --- /dev/null +++ b/charts/hub/devspaces/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "devspaces.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "devspaces.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "devspaces.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "devspaces.labels" -}} +helm.sh/chart: {{ include "devspaces.chart" . }} +{{ include "devspaces.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "devspaces.selectorLabels" -}} +app.kubernetes.io/name: {{ include "devspaces.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "devspaces.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "devspaces.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/hub/devspaces/templates/devspaces-instance.yaml b/charts/hub/devspaces/templates/devspaces-instance.yaml new file mode 100644 index 00000000..276282a3 --- /dev/null +++ b/charts/hub/devspaces/templates/devspaces-instance.yaml @@ -0,0 +1,43 @@ +apiVersion: org.eclipse.che/v2 +kind: CheCluster +metadata: + name: devspaces + labels: + {{- include "devspaces.labels" . | nindent 4 }} +spec: + devEnvironments: + defaultEditor: che-incubator/che-code/insiders + defaultNamespace: + template: -devspaces + secondsOfInactivityBeforeIdling: -1 + secondsOfRunBeforeIdling: -1 + storage: + pvcStrategy: per-user + components: + cheServer: + debug: false + logLevel: INFO + dashboard: {} + database: + credentialsSecretName: postgres-credentials + externalDb: false + postgresDb: dbche + postgresHostName: postgres + postgresPort: "5432" + pvc: + claimSize: 1Gi + devWorkspace: {} + devfileRegistry: {} + imagePuller: + enable: false + spec: {} + metrics: + enable: true + pluginRegistry: {} + containerRegistry: {} + networking: + auth: + gateway: + configLabels: + app: che + component: che-gateway-config diff --git a/charts/hub/devspaces/values.yaml b/charts/hub/devspaces/values.yaml new file mode 100644 index 00000000..135f8321 --- /dev/null +++ b/charts/hub/devspaces/values.yaml @@ -0,0 +1,82 @@ +# Default values for devspaces. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/values-hub.yaml b/values-hub.yaml index fcd4becb..1a9b3804 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -15,6 +15,7 @@ clusterGroup: - devsecops-ci - openshift-storage - quay-enterprise + - openshift-devspaces # subscriptions: OpenShift Operator subscriptions from OLM/OperatorHub # - name: the Operator package name (required) @@ -44,6 +45,11 @@ clusterGroup: namespace: openshift-operators channel: stable-3.7 + devspaces: + name: devspaces + namespace: openshift-devspaces + channel: stable + # The following section is used by # OpenShift GitOps (ArgoCD) # Projects are just ArgoCD groupings that can be filtered on. @@ -51,6 +57,7 @@ clusterGroup: - hub - opp - external-secrets + - devspaces applications: acm: @@ -123,6 +130,12 @@ clusterGroup: project: hub path: charts/hub/cli-tools + devspaces: + name: devspaces + namespace: openshift-devspaces + project: devspaces + path: charts/hub/devspaces + imperative: # NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm # The default schedule is every 10 minutes: imperative.schedule From 187e85d041da0171a656ed2775051e97c79686a1 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 10:29:39 -0500 Subject: [PATCH 04/14] fixed operator namespace --- values-hub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values-hub.yaml b/values-hub.yaml index 1a9b3804..30717e7d 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -47,7 +47,7 @@ clusterGroup: devspaces: name: devspaces - namespace: openshift-devspaces + namespace: openshift-operators channel: stable # The following section is used by From 531d3acc0d791c894b6af979ed81857c6b57fa52 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 10:42:30 -0500 Subject: [PATCH 05/14] debug --- values-hub.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 30717e7d..4b12aa28 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -45,10 +45,10 @@ clusterGroup: namespace: openshift-operators channel: stable-3.7 - devspaces: - name: devspaces - namespace: openshift-operators - channel: stable + # devspaces: + # name: devspaces + # namespace: openshift-operators + # channel: stable # The following section is used by # OpenShift GitOps (ArgoCD) From 1dab6ee4eed6d778fc4b0dd144a7a6f18ad4cb0b Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 11:06:33 -0500 Subject: [PATCH 06/14] debug --- values-hub.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 4b12aa28..30717e7d 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -45,10 +45,10 @@ clusterGroup: namespace: openshift-operators channel: stable-3.7 - # devspaces: - # name: devspaces - # namespace: openshift-operators - # channel: stable + devspaces: + name: devspaces + namespace: openshift-operators + channel: stable # The following section is used by # OpenShift GitOps (ArgoCD) From bfa6ad3ee8db345f6239d1bd89a228a68c526fb6 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 11:34:58 -0500 Subject: [PATCH 07/14] updated operator versions --- values-hub.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 30717e7d..d68b0776 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -33,17 +33,17 @@ clusterGroup: acs: name: rhacs-operator #packageName namespace: openshift-operators # operator namespace - channel: rhacs-3.71 + channel: rhacs-3.74 odf: name: odf-operator namespace: openshift-storage - channel: stable-4.12 + channel: stable-4.11 quay: name: quay-operator namespace: openshift-operators - channel: stable-3.7 + channel: stable-3.8 devspaces: name: devspaces From 16c2afb4a94a3e62970fa7d83af9a22675b7871c Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:10:24 -0500 Subject: [PATCH 08/14] fixed operator versions --- ...git-oauth-credentials-external-secret.yaml | 36 ++++++++ charts/hub/devspaces/values.yaml | 85 +------------------ values-hub.yaml | 8 +- 3 files changed, 43 insertions(+), 86 deletions(-) create mode 100644 charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml new file mode 100644 index 00000000..762563b5 --- /dev/null +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -0,0 +1,36 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: git-oauth-credentials + labels: + {{- include "devspaces.labels" . | nindent 4 }} +spec: + refreshInterval: 1h + secretStoreRef: + name: {{ $.Values.secretStore.name }} + kind: {{ $.Values.secretStore.kind }} + target: + name: github-oauth-config + creationPolicy: Owner + template: + metadata: + labels: + app.kubernetes.io/part-of: che.eclipse.org + app.kubernetes.io/component: oauth-scm-configuration + annotations: + che.eclipse.org/oauth-scm-server: github + che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo + data: + id: {{ .clientID }} + secret: {{ clientSecret }} + data: + - secretKey: clientID + remoteRef: + key: github-devspaces + #version: provider-key-version + property: client-id + - secretKey: clientSecret + remoteRef: + key: github-devspaces + #version: provider-key-version + property: client-secret diff --git a/charts/hub/devspaces/values.yaml b/charts/hub/devspaces/values.yaml index 135f8321..bd9b7009 100644 --- a/charts/hub/devspaces/values.yaml +++ b/charts/hub/devspaces/values.yaml @@ -1,82 +1,3 @@ -# Default values for devspaces. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} +secretStore: + name: vault-backend + kind: ClusterSecretStore \ No newline at end of file diff --git a/values-hub.yaml b/values-hub.yaml index d68b0776..bf166170 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -28,22 +28,22 @@ clusterGroup: acm: name: advanced-cluster-management namespace: open-cluster-management - channel: release-2.7 + channel: release-2.6 acs: name: rhacs-operator #packageName namespace: openshift-operators # operator namespace - channel: rhacs-3.74 + channel: rhacs-3.71 odf: name: odf-operator namespace: openshift-storage - channel: stable-4.11 + channel: stable-4.10 quay: name: quay-operator namespace: openshift-operators - channel: stable-3.8 + channel: stable-3.7 devspaces: name: devspaces From cc3a811b1501236a2c198874c1c96ba0cc05d6c7 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:41:02 -0500 Subject: [PATCH 09/14] fixed template --- .../templates/git-oauth-credentials-external-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index 762563b5..ad4e6e34 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -21,8 +21,8 @@ spec: che.eclipse.org/oauth-scm-server: github che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo data: - id: {{ .clientID }} - secret: {{ clientSecret }} + id: {{ "{{" }} .clientID {{ "}}"}} + secret: {{ "{{" }} clientSecret {{ "}}"}} data: - secretKey: clientID remoteRef: From 6b39ee1421f2289026f1e0254d71334122de5fc6 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:42:10 -0500 Subject: [PATCH 10/14] f --- .../templates/git-oauth-credentials-external-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index ad4e6e34..7efff8cf 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -21,8 +21,8 @@ spec: che.eclipse.org/oauth-scm-server: github che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo data: - id: {{ "{{" }} .clientID {{ "}}"}} - secret: {{ "{{" }} clientSecret {{ "}}"}} + id: {{ "{{" }} .clientID {{ "}}" }} + secret: {{ "{{" }} clientSecret {{ "}}" }} data: - secretKey: clientID remoteRef: From 9bacbcca453ad7beee18ae27d85933b04e034509 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:42:30 -0500 Subject: [PATCH 11/14] f --- .../templates/git-oauth-credentials-external-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index 7efff8cf..a29faeba 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -22,7 +22,7 @@ spec: che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo data: id: {{ "{{" }} .clientID {{ "}}" }} - secret: {{ "{{" }} clientSecret {{ "}}" }} + secret: {{ "{{" }} .clientSecret {{ "}}" }} data: - secretKey: clientID remoteRef: From 2d924cd7de13651fe6050e741024e0cfacacc1f1 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:46:20 -0500 Subject: [PATCH 12/14] f --- .../templates/git-oauth-credentials-external-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index a29faeba..42d6d85b 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -21,8 +21,8 @@ spec: che.eclipse.org/oauth-scm-server: github che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo data: - id: {{ "{{" }} .clientID {{ "}}" }} - secret: {{ "{{" }} .clientSecret {{ "}}" }} + id: "{{ "{{" }} .clientID {{ "}}" }}" + secret: "{{ "{{" }} .clientSecret {{ "}}" }}" data: - secretKey: clientID remoteRef: From 5978ddce805e4c61bf2d222f41768aa3982fca22 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 13:56:59 -0500 Subject: [PATCH 13/14] f --- .../templates/git-oauth-credentials-external-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index 42d6d85b..c4f17f7f 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -26,11 +26,11 @@ spec: data: - secretKey: clientID remoteRef: - key: github-devspaces + key: secret/data/hub/github-devspaces #version: provider-key-version property: client-id - secretKey: clientSecret remoteRef: - key: github-devspaces + key: secret/data/hub/github-devspaces #version: provider-key-version property: client-secret From e7de8d59e44636f911d2a62cbb4e4f7bc17e9b66 Mon Sep 17 00:00:00 2001 From: Raffaele Spazzoli Date: Wed, 1 Mar 2023 14:08:21 -0500 Subject: [PATCH 14/14] f --- .../templates/git-oauth-credentials-external-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml index c4f17f7f..6b6db60f 100644 --- a/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml +++ b/charts/hub/devspaces/templates/git-oauth-credentials-external-secret.yaml @@ -19,7 +19,7 @@ spec: app.kubernetes.io/component: oauth-scm-configuration annotations: che.eclipse.org/oauth-scm-server: github - che.eclipse.org/scm-server-endpoint: https://github.com/raf-backstage-demo + che.eclipse.org/scm-server-endpoint: https://github.com data: id: "{{ "{{" }} .clientID {{ "}}" }}" secret: "{{ "{{" }} .clientSecret {{ "}}" }}"