cli squash

Author: mjudeikis

backend/oidc/oidc.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"path"
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
@@ -71,8 +70,9 @@ type Config struct {
 
 	CodeChallengeMethodsSupported []string
 
-	// CallbackURL is kube-bind specific and must match API server endpoints.
+	// CallbackURL and IssuerURL are kube-bind specific and must match API server endpoints.
 	CallbackURL string
+	IssuerURL   string
 }
 
 var ErrServerNotRunning = fmt.Errorf("embedded OIDC server is not running")
@@ -86,9 +86,8 @@ func (s *Server) AddRoutes(mux *mux.Router) {
 }
 
 // URL returns the base URL of the embedded OIDC server.
-func (s *Server) Config() (*Config, error) {
-	spew.Dump(s.server.Config())
-	return &Config{
+func (s *Server) Config(callbackURL, issuerURL string) (*Config, error) {
+	c := &Config{
 		ClientID:     s.server.Config().ClientID,
 		ClientSecret: s.server.Config().ClientSecret,
 		Issuer:       s.server.Config().Issuer,
@@ -97,8 +96,11 @@ func (s *Server) Config() (*Config, error) {
 		RefreshTTL: s.server.Config().RefreshTTL,
 
 		CodeChallengeMethodsSupported: s.server.Config().CodeChallengeMethodsSupported,
-		CallbackURL:                   path.Join(s.server.Addr(), "api/callback"),
-	}, nil
+		CallbackURL:                   callbackURL,
+		IssuerURL:                     issuerURL,
+	}
+	spew.Dump(c)
+	return c, nil
 }
 
 func LoadTLSConfig(caFile string) (*tls.Config, error) {

cli/pkg/kubectl/dev/plugin/dev.go

@@ -269,7 +269,7 @@ func (o *DevOptions) installHelmChart(ctx context.Context, restConfig *rest.Conf
 	values := map[string]interface{}{
 		"image": map[string]interface{}{
 			"repository": "ghcr.io/mjudeikis/backend",
-			"tag":        "c27e82a",
+			"tag":        "2e01ef5",
 		},
 		"examples": map[string]interface{}{
 			"enabled": true,