From ced2e251e239289c1eb77499c1963b7f659f701f Mon Sep 17 00:00:00 2001
From: Nikos <nikos.sklikas@canonical.com>
Date: Wed, 27 Mar 2024 13:45:00 +0200
Subject: [PATCH] fix: update config

- Point to canonical hydra repo
- Pin contour version
---
 hack/helm/hydra.yaml        | 5 ++---
 hack/kubectl/flow-test.yaml | 1 -
 rockcraft.yaml              | 4 ++--
 skaffold.yaml               | 1 +
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hack/helm/hydra.yaml b/hack/helm/hydra.yaml
index 416b5ad7..04099bd2 100644
--- a/hack/helm/hydra.yaml
+++ b/hack/helm/hydra.yaml
@@ -27,10 +27,9 @@ hydra:
         public: https://iam.internal:8443/
       login: https://iam.internal:8443/ui/login
       consent: https://iam.internal:8443/ui/consent
-      # device: http://iam.internal:8443/admin/oauth2/auth/requests/device/verify
-      device: https://iam.internal:8443/ui/device
+      device_verification: https://iam.internal:8443/ui/device
       post_device_done: https://iam.internal:8443/api/v0/status
-      error: https://iam.internal:8443//ui/oidc_error
+      error: https://iam.internal:8443/ui/oidc_error
     ttl:
       # configures how long a user login and consent flow may take. Defaults to 1h.
       login_consent_request: 1h
diff --git a/hack/kubectl/flow-test.yaml b/hack/kubectl/flow-test.yaml
index 04807a77..3ecfed7b 100644
--- a/hack/kubectl/flow-test.yaml
+++ b/hack/kubectl/flow-test.yaml
@@ -62,7 +62,6 @@ data:
   HYDRA_ADMIN_API_URL: http://hydra-admin.default.svc.cluster.local:4445
   CALLBACK_URI: http://flow-test.default.svc.cluster.local/api/ready
   # OAUTH_CLIENT_SECRET: KOVbs8SDizELCUQhFEDLYPA4zN
-  OAUTH_CLIENT_ID:
   SCOPES: openid,offline,email,profile
   PROVIDER: "0" # hydra
   AUTH_URL: http://hydra-public.default.svc.cluster.local:4444/oauth2/auth
diff --git a/rockcraft.yaml b/rockcraft.yaml
index 6b3d84d4..acac72f1 100644
--- a/rockcraft.yaml
+++ b/rockcraft.yaml
@@ -54,6 +54,6 @@ parts:
       export CGO_ENABLED=0
       go mod download all
       go build -ldflags="${go_linker_flags}" -o "${CRAFT_PART_INSTALL}"/bin/hydra
-    source: https://github.com/BuzzBumbleBee/hydra
+    source: https://github.com/canonical/hydra
     source-type: git
-    source-branch: feat_dev_grants_2x
+    source-branch: canonical
diff --git a/skaffold.yaml b/skaffold.yaml
index 74ada91d..2c7fdd2b 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -71,6 +71,7 @@ profiles:
               installCRDs: true
           - name: contour
             remoteChart: oci://registry-1.docker.io/bitnamicharts/contour
+            version: 15.0.1
 
 
 portForward: