From 3d761e722fd3c6fa668dda2312bd9277cba7ca81 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Mon, 29 Jan 2024 09:08:30 -0500 Subject: [PATCH] cherry pick rock, `workingdir` fix to main (#133) * explicitly set workingdir for workload in charm.py (#128) * use rock for oidc-authservice on `main` for ckf-1.8 (#132) Closes #131 --- metadata.yaml | 2 +- src/charm.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/metadata.yaml b/metadata.yaml index 80fc495..34a8920 100755 --- a/metadata.yaml +++ b/metadata.yaml @@ -22,7 +22,7 @@ resources: type: oci-image description: 'Backing OCI image' auto-fetch: true - upstream-source: docker.io/kubeflowmanifestswg/oidc-authservice:e236439 + upstream-source: charmedkubeflow/oidc-authservice:ckf-1.8-58e8217 peers: client-secret: interface: client-secret diff --git a/src/charm.py b/src/charm.py index b34a774..f32922a 100755 --- a/src/charm.py +++ b/src/charm.py @@ -117,6 +117,9 @@ def _oidc_layer(self): "command": "/home/authservice/oidc-authservice", "environment": self.service_environment, "startup": "enabled", + # See https://github.com/canonical/oidc-gatekeeper-operator/pull/128 + # for context on why we need working-dir set here. + "working-dir": "/home/authservice", } }, }