Provided CA via kumactl

app/kumactl/cmd/config/config_control_planes_add.go

@@ -14,8 +14,8 @@ func newConfigControlPlanesAddCmd(pctx *kumactl_cmd.RootContext) *cobra.Command
 		name                     string
 		apiServerURL             string
 		overwrite                bool
-		dataplaneTokenClientCert string
-		dataplaneTokenClientKey  string
+		adminClientCert string
+		adminClientKey  string
 	}{}
 	cmd := &cobra.Command{
 		Use:   "add",
@@ -45,9 +45,9 @@ func newConfigControlPlanesAddCmd(pctx *kumactl_cmd.RootContext) *cobra.Command
 				Name:         cp.Name,
 				ControlPlane: cp.Name,
 				Credentials: &config_proto.Context_Credentials{
-					DataplaneTokenApi: &config_proto.Context_DataplaneTokenApiCredentials{
-						ClientCert: args.dataplaneTokenClientCert,
-						ClientKey:  args.dataplaneTokenClientKey,
+					AdminApi: &config_proto.Context_AdminApiCredentials{
+						ClientCert: args.adminClientCert,
+						ClientKey:  args.adminClientKey,
 					},
 				},
 			}
@@ -72,7 +72,7 @@ func newConfigControlPlanesAddCmd(pctx *kumactl_cmd.RootContext) *cobra.Command
 	cmd.Flags().StringVar(&args.apiServerURL, "address", "", "URL of the Control Plane API Server (required)")
 	_ = cmd.MarkFlagRequired("address")
 	cmd.Flags().BoolVar(&args.overwrite, "overwrite", false, "overwrite existing Control Plane with the same reference name")
-	cmd.Flags().StringVar(&args.dataplaneTokenClientCert, "dataplane-token-client-cert", "", "Path to certificate of a client that is authorized to use Dataplane Token Server")
-	cmd.Flags().StringVar(&args.dataplaneTokenClientKey, "dataplane-token-client-key", "", "Path to certificate key of a client that is authorized to use Dataplane Token Server")
+	cmd.Flags().StringVar(&args.adminClientCert, "admin-client-cert", "", "Path to certificate of a client that is authorized to use Admin Server")
+	cmd.Flags().StringVar(&args.adminClientKey, "admin-client-key", "", "Path to certificate key of a client that is authorized to use Admin Server")
 	return cmd
 }

app/kumactl/cmd/config/config_control_planes_add_test.go

@@ -184,8 +184,8 @@ var _ = Describe("kumactl config control-planes add", func() {
 					"config", "control-planes", "add",
 					"--name", "example",
 					"--address", fmt.Sprintf("http://localhost:%d", port),
-					"--dataplane-token-client-cert", "/tmp/client.pem",
-					"--dataplane-token-client-key", "/tmp/client.key.pem"}
+					"--admin-client-cert", "/tmp/client.pem",
+					"--admin-client-key", "/tmp/client.key.pem"}
 				if given.overwrite {
 					args = append(args, "--overwrite")
 				}

app/kumactl/cmd/config/testdata/config-control-planes-add.01.golden.yaml

@@ -2,7 +2,7 @@ contexts:
 - controlPlane: example
   name: example
   credentials:
-    dataplaneTokenApi:
+    adminApi:
       clientCert: /tmp/client.pem
       clientKey: /tmp/client.key.pem
 controlPlanes:

app/kumactl/cmd/config/testdata/config-control-planes-add.02.golden.yaml

@@ -10,7 +10,7 @@ contexts:
 - controlPlane: example
   name: example
   credentials:
-    dataplaneTokenApi:
+    adminApi:
       clientCert: /tmp/client.pem
       clientKey: /tmp/client.key.pem
 controlPlanes:

app/kumactl/cmd/config/testdata/config-control-planes-add.03.golden.yaml

@@ -6,7 +6,7 @@ contexts:
   - controlPlane: example
     name: example
     credentials:
-      dataplaneTokenApi:
+      adminApi:
         clientCert: /tmp/client.pem
         clientKey: /tmp/client.key.pem
 controlPlanes:

app/kumactl/cmd/generate/generate_dataplane_token_test.go

@@ -40,7 +40,7 @@ var _ = Describe("kumactl generate dataplane-token", func() {
 		generator = &staticDataplaneTokenGenerator{}
 		ctx = &kumactl_cmd.RootContext{
 			Runtime: kumactl_cmd.RootRuntime{
-				NewDataplaneTokenClient: func(string, *config_kumactl.Context_DataplaneTokenApiCredentials) (tokens.DataplaneTokenClient, error) {
+				NewDataplaneTokenClient: func(string, *config_kumactl.Context_AdminApiCredentials) (tokens.DataplaneTokenClient, error) {
 					return generator, nil
 				},
 				NewCatalogClient: func(s string) (catalog_client.CatalogClient, error) {

app/kumactl/cmd/manage/ca/provided.go

@@ -153,12 +153,12 @@ func printListCertificates(certs []types.SigningCert, out io.Writer) error {
 				cert := certs[i]
 				x509Cert := x509Certs[i]
 				return []string{
-					cert.Id, // ID
-					x509Cert.Subject.CommonName, // COMMON NAME
-					x509Cert.SerialNumber.String(), // SERIAL NUMBER
-					x509Cert.NotBefore.String(), // NOT VALID BEFORE
-					x509Cert.NotAfter.String(), // NOT VALID AFTER
-					fmt.Sprintf("%x", sha1.Sum(x509Cert.Raw)), // SHA-1 FINGERPRINT
+					cert.Id,                                           // ID
+					x509Cert.Subject.CommonName,                       // COMMON NAME
+					x509Cert.SerialNumber.String(),                    // SERIAL NUMBER
+					x509Cert.NotBefore.String(),                       // NOT VALID BEFORE
+					x509Cert.NotAfter.String(),                        // NOT VALID AFTER
+					fmt.Sprintf("%x", sha1.Sum(x509Cert.Raw)),         // SHA-1 FINGERPRINT
 					fmt.Sprintf("%x", sha256.New().Sum(x509Cert.Raw)), // SHA-256 FINGERPRINT
 				}
 			}

app/kumactl/pkg/cmd/root_context.go

@@ -31,7 +31,7 @@ type RootRuntime struct {
 	Now                        func() time.Time
 	NewResourceStore           func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error)
 	NewDataplaneOverviewClient func(*config_proto.ControlPlaneCoordinates_ApiServer) (kumactl_resources.DataplaneOverviewClient, error)
-	NewDataplaneTokenClient    func(string, *kumactl_config.Context_DataplaneTokenApiCredentials) (tokens.DataplaneTokenClient, error)
+	NewDataplaneTokenClient    func(string, *kumactl_config.Context_AdminApiCredentials) (tokens.DataplaneTokenClient, error)
 	NewCatalogClient           func(string) (catalog_client.CatalogClient, error)
 	NewProvidedCaClient        func(string) (rest.ProvidedCaClient, error)
 }
@@ -158,12 +158,12 @@ func (rc *RootContext) CurrentDataplaneTokenClient() (tokens.DataplaneTokenClien
 		}
 		dpTokenUrl = components.Apis.DataplaneToken.PublicUrl
 	}
-	return rc.Runtime.NewDataplaneTokenClient(dpTokenUrl, ctx.GetCredentials().GetDataplaneTokenApi())
+	return rc.Runtime.NewDataplaneTokenClient(dpTokenUrl, ctx.GetCredentials().GetAdminApi())
 }
 
 func validateRemoteDataplaneTokenServerSettings(ctx *kumactl_config.Context, components catalog.Catalog) error {
 	reason := ""
-	clientConfigured := ctx.GetCredentials().GetDataplaneTokenApi().HasClientCert()
+	clientConfigured := ctx.GetCredentials().GetAdminApi().HasClientCert()
 	serverConfigured := components.Apis.DataplaneToken.PublicUrl != ""
 	if !clientConfigured && serverConfigured {
 		reason = "dataplane token server in kuma-cp is configured with TLS and kumactl is not."

app/kumactl/pkg/tokens/client.go

@@ -17,7 +17,7 @@ const (
 	timeout = 10 * time.Second
 )
 
-func NewDataplaneTokenClient(address string, config *kumactl_config.Context_DataplaneTokenApiCredentials) (DataplaneTokenClient, error) {
+func NewDataplaneTokenClient(address string, config *kumactl_config.Context_AdminApiCredentials) (DataplaneTokenClient, error) {
 	baseURL, err := url.Parse(address)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to parse Dataplane Token Server URL")

app/kumactl/pkg/tokens/client_test.go

@@ -76,7 +76,7 @@ var _ = Describe("Tokens Client", func() {
 
 	type testCase struct {
 		url    func() string
-		config *config_kumactl.Context_DataplaneTokenApiCredentials
+		config *config_kumactl.Context_AdminApiCredentials
 	}
 	DescribeTable("should return a token",
 		func(given testCase) {
@@ -107,7 +107,7 @@ var _ = Describe("Tokens Client", func() {
 			url: func() string {
 				return fmt.Sprintf("https://localhost:%d", publicPort)
 			},
-			config: &config_kumactl.Context_DataplaneTokenApiCredentials{
+			config: &config_kumactl.Context_AdminApiCredentials{
 				ClientCert: filepath.Join("..", "..", "..", "..", "pkg", "admin-server", "testdata", "authorized-client-cert.pem"),
 				ClientKey:  filepath.Join("..", "..", "..", "..", "pkg", "admin-server", "testdata", "authorized-client-key.pem"),
 			},

pkg/api-server/catalog_ws_test.go

@@ -17,6 +17,8 @@ var _ = Describe("Catalog WS", func() {
 		cfg := config.DefaultApiServerConfig()
 		cfg.Catalog.Admin.LocalUrl = "http://localhost:1111"
 		cfg.Catalog.Admin.PublicUrl = "https://kuma.internal:2222"
+		cfg.Catalog.DataplaneToken.LocalUrl = "http://localhost:1111"
+		cfg.Catalog.DataplaneToken.PublicUrl = "https://kuma.internal:2222"
 		cfg.Catalog.Bootstrap.Url = "http://kuma.internal:3333"
 
 		// setup
@@ -53,7 +55,7 @@ var _ = Describe("Catalog WS", func() {
 				"dataplaneToken": {
 					"localUrl": "http://localhost:1111",
 					"publicUrl": "https://kuma.internal:2222"
-				}
+				},
 				"admin": {
 					"localUrl": "http://localhost:1111",
 					"publicUrl": "https://kuma.internal:2222"