endpoints: Add review kubernetes auth token RPC (#854)

canonical · Dec 4, 2024 · bb2be37 · bb2be37
1 parent a008465
commit bb2be37
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/docs/src/_parts/bootstrap_config.md b/docs/src/_parts/bootstrap_config.md
@@ -483,3 +483,8 @@ The format is `map[<--flag-name>]<value>`.
 
 Extra configuration for the containerd config.toml
 
+### containerd-base-dir
+**Type:** `string`<br>
+
+The base directory in which the containerd-related files are located.
+
diff --git a/docs/src/_parts/control_plane_join_config.md b/docs/src/_parts/control_plane_join_config.md
@@ -150,3 +150,8 @@ The format is `map[<--flag-name>]<value>`.
 
 Extra configuration for the containerd config.toml
 
+### containerd-base-dir
+**Type:** `string`<br>
+
+The base directory in which the containerd-related files are located.
+
diff --git a/docs/src/_parts/worker_join_config.md b/docs/src/_parts/worker_join_config.md
@@ -76,3 +76,8 @@ The format is `map[<--flag-name>]<value>`.
 
 Extra configuration for the containerd config.toml
 
+### containerd-base-dir
+**Type:** `string`<br>
+
+The base directory in which the containerd-related files are located.
+
diff --git a/src/k8s/go.mod b/src/k8s/go.mod
@@ -5,7 +5,7 @@ go 1.22.6
 require (
 	dario.cat/mergo v1.0.0
 	github.com/canonical/go-dqlite v1.22.0
-	github.com/canonical/k8s-snap-api v1.0.14
+	github.com/canonical/k8s-snap-api v1.0.15
 	github.com/canonical/lxd v0.0.0-20240822122218-e7b2a7a83230
 	github.com/canonical/microcluster/v3 v3.0.0-20240827143335-f7a4d3984970
 	github.com/go-logr/logr v1.4.2

diff --git a/src/k8s/go.sum b/src/k8s/go.sum
@@ -99,8 +99,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXe
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/canonical/go-dqlite v1.22.0 h1:DuJmfcREl4gkQJyvZzjl2GHFZROhbPyfdjDRQXpkOyw=
 github.com/canonical/go-dqlite v1.22.0/go.mod h1:Uvy943N8R4CFUAs59A1NVaziWY9nJ686lScY7ywurfg=
-github.com/canonical/k8s-snap-api v1.0.14 h1:x02BAQWOFxV0eV3BHToxwDlNhYwro/vduO+Oyoxi5fk=
-github.com/canonical/k8s-snap-api v1.0.14/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY=
+github.com/canonical/k8s-snap-api v1.0.15 h1:uhEJiEhrK93tJAly+quuAayanMhT/5vpePlG+xxVCPA=
+github.com/canonical/k8s-snap-api v1.0.15/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY=
 github.com/canonical/lxd v0.0.0-20240822122218-e7b2a7a83230 h1:YOqZ+/14OPZ+/TOXpRHIX3KLT0C+wZVpewKIwlGUmW0=
 github.com/canonical/lxd v0.0.0-20240822122218-e7b2a7a83230/go.mod h1:YVGI7HStOKsV+cMyXWnJ7RaMPaeWtrkxyIPvGWbgACc=
 github.com/canonical/microcluster/v3 v3.0.0-20240827143335-f7a4d3984970 h1:UrnpglbXELlxtufdk6DGDytu2JzyzuS3WTsOwPrkQLI=

diff --git a/src/k8s/pkg/k8sd/api/endpoints.go b/src/k8s/pkg/k8sd/api/endpoints.go
@@ -121,7 +121,7 @@ func (e *Endpoints) Endpoints() []rest.Endpoint {
 		},
 		{
 			Name: "KubernetesAuthWebhook",
-			Path: "kubernetes/auth/webhook",
+			Path: apiv1.ReviewKubernetesAuthTokenRPC,
 			Post: rest.EndpointAction{Handler: e.postKubernetesAuthWebhook, AllowUntrusted: true},
 		},
 		// ClusterAPI management endpoints.