Fixup ory_auth

Summary:
The changes for public cloud meant that a bunch of ory_auth stuff changed
This fixes the configs so that bringing up a skaffold based ory_auth cloud works
again.

Test Plan: `skaffold run -f skaffold/skaffold_cloud.yaml -p ory_auth`

Reviewers: philkuz, michelle

Reviewed By: philkuz, michelle

Differential Revision: https://phab.corp.pixielabs.ai/D8829

GitOrigin-RevId: 1b7f9e80148a0bf2b8cd2fe2a7467e6943a5a6fa

DEVELOPMENT.md

@@ -42,8 +42,7 @@ make dev-env-start
 3. Load basic artifacts into the database.
 
     ```
-    # --load_ory_auth only works for skaffold cloud's started with `-p ory_auth`.
-    ./scripts/load_dev_db.sh plc-dev [--load_ory_auth]
+    ./scripts/load_dev_db.sh plc-dev
     ```
 4. Update `/etc/hosts` so that it knows to point `dev.withpixie.dev` to your running dev cloud instance. The `dev_dns_updater` will do this process for you.
 

skaffold/skaffold_cloud.yaml

@@ -46,6 +46,10 @@ build:
     context: .
     bazel:
       target: //src/cloud/scriptmgr:scriptmgr_server_image.tar
+  - image: gcr.io/pixie-oss/pixie-dev/cloud/job/create_admin_job_image
+    context: .
+    bazel:
+      target: //src/cloud/jobs/create_admin_user:create_admin_job_image.tar
   tagPolicy:
     dateTime: {}
   local:
@@ -73,29 +77,18 @@ profiles:
   - command: dev
 - name: ory_auth
   patches:
-  - op: add
+  - op: replace
     path: /deploy/kustomize/paths
-    value: [k8s/cloud/dev/ory_auth]
-- name: ory_auth_prod
-  patches:
-  - op: add
-    path: /deploy/kustomize/paths
-    value: [k8s/cloud/base/ory_auth]
-- name: create_admin_job
-  build:
-    artifacts:
-    - image: gcr.io/pixie-oss/pixie-dev/cloud/job/create_admin_job_image
-      context: .
-      bazel:
-        target: //src/cloud/jobs/create_admin_user:create_admin_job_image.tar
-  patches:
+    value: [k8s/cloud/dev, k8s/cloud/dev/ory_auth]
   - op: add
     path: /build/artifacts/context=./bazel/args
     value:
     - --compilation_mode=dbg
-  - op: replace
+- name: ory_auth_prod
+  patches:
+  - op: add
     path: /deploy/kustomize/paths
-    value: [k8s/cloud/base/ory_auth/job]
+    value: [k8s/cloud/base/ory_auth]
 - name: staging
   patches:
   - op: add

src/ui/webpack.config.js

@@ -249,7 +249,7 @@ module.exports = (env, argv) => {
   let oauthYAML = utils.readYAMLFile(join(topLevelDir, 'credentials', 'k8s', credentialsEnv, 'configs', 'oauth_config.yaml'), true);
   // Special case for ory_auth where we read from the unecrypted file.
   if (oauthConfigEnv === 'ory_auth') {
-    oauthYAML = utils.readYAMLFile( join(topLevelDir, 'k8s', 'cloud', oauthConfigEnv, 'oauth_config.yaml'), false);
+    oauthYAML = utils.readYAMLFile( join(topLevelDir, 'k8s', 'cloud', 'base', oauthConfigEnv, 'oauth_config.yaml'), false);
   }
 
   // Setup the auth client.