From b48be27ca80cbf5ee10871493ccbee47249852e0 Mon Sep 17 00:00:00 2001
From: NopeCharon <115794254+NopeCharon@users.noreply.github.com>
Date: Sun, 25 Oct 2026 15:22:49 +0530
Subject: [PATCH] Remove duplicate pl-oauth-config ConfigMap from public cloud
 deps

The pl-oauth-config ConfigMap was defined both in
k8s/cloud_deps/public/configs.yaml and in
k8s/cloud/base/ory_auth/oauth_config.yaml, with identical data. The
self-hosted install applies cloud_deps first and cloud afterwards, so
the copy in cloud_deps is always overwritten and never takes effect.
None of the cloud_deps resources consume it either; only the auth server
and cloud proxy in k8s/cloud do.

The duplicate also breaks anyone combining the released cloud_deps.yaml
and cloud.yaml bundles in a single kustomization:

  may not add resource with an already registered id:
  ConfigMap.v1.[noGrp]/pl-oauth-config.plc

Drop the ConfigMap from cloud_deps and carry its explanatory comment over
to the ory_auth definition, which is the one that is actually deployed
(and the only one used by the dev cloud_deps overlay as well).

Fixes #1840

Signed-off-by: NopeCharon <115794254+NopeCharon@users.noreply.github.com>
---
 k8s/cloud/base/ory_auth/oauth_config.yaml |  2 ++
 k8s/cloud_deps/public/configs.yaml        | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/k8s/cloud/base/ory_auth/oauth_config.yaml b/k8s/cloud/base/ory_auth/oauth_config.yaml
index ee308ef45ce..3a75ba9fe83 100644
--- a/k8s/cloud/base/ory_auth/oauth_config.yaml
+++ b/k8s/cloud/base/ory_auth/oauth_config.yaml
@@ -4,6 +4,8 @@ kind: ConfigMap
 metadata:
   name: pl-oauth-config
 data:
+  # Currently supported options are hydra and auth0.
+  # Hydra is the easiest option to get started with.
   PL_OAUTH_PROVIDER: hydra
   PL_AUTH_URI: /oauth/hydra
   PL_AUTH_CLIENT_ID: auth-code-client
diff --git a/k8s/cloud_deps/public/configs.yaml b/k8s/cloud_deps/public/configs.yaml
index 3accf6ddfd6..36279c4df9c 100644
--- a/k8s/cloud_deps/public/configs.yaml
+++ b/k8s/cloud_deps/public/configs.yaml
@@ -20,18 +20,6 @@ data:
 ---
 apiVersion: v1
 kind: ConfigMap
-metadata:
-  name: pl-oauth-config
-data:
-  # Currently supported options are hydra and auth0.
-  # Hydra is the easiest option to get started with.
-  PL_OAUTH_PROVIDER: hydra
-  PL_AUTH_URI: /oauth/hydra
-  PL_AUTH_CLIENT_ID: auth-code-client
-  PL_AUTH_EMAIL_PASSWORD_CONN: ""
----
-apiVersion: v1
-kind: ConfigMap
 metadata:
   name: segment-config
 data: