cleanup: Remove old server-side hints (#1450)

Author: pavolmarko

internal/build/buildkit/client.go

@@ -44,7 +44,6 @@ var (
 	BuildOnNamespaceCloud           = knobs.Bool("build_in_nscloud", "If set to true, builds are triggered remotely.", false)
 	BuildOnNamespaceCloudUnlessHost = knobs.Bool("build_in_nscloud_unless_host", "If set to true, builds that match the host platform run locally. All other builds are triggered remotely.", false)
 	BuildOnExistingBuildkit         = knobs.String("buildkit_addr", "The address of an existing buildkitd to use.", "")
-	BuildUsingServerSideProxy       = knobs.Bool("build_using_server_side_proxy", "If set to true, builds are performed using the server-side buildkit proxy.", false)
 )
 
 const SSHAgentProviderID = "default"
@@ -173,51 +172,37 @@ func (c *clientInstance) Compute(ctx context.Context, _ compute.Resolved) (*Gate
 	}
 
 	if buildRemotely(c.conf, c.platform) {
-		profile, err := api.GetProfile(ctx, api.Methods)
+		parsedPlatform, err := parsePlatformOrDefault(c.platform)
 		if err != nil {
-			return nil, err
+			return nil, fnerrors.InternalError("failed to parse build platform: %v", err)
 		}
 
-		if profile.BuildServerSideProxyHint || BuildUsingServerSideProxy.Get(c.conf) {
-			parsedPlatform, err := parsePlatformOrDefault(c.platform)
-			if err != nil {
-				return nil, fnerrors.InternalError("failed to parse build platform: %v", err)
-			}
-
-			stateDir, err := dirs.Ensure(cluster.DetermineStateDir("", cluster.BuildkitProxyPath))
-			if err != nil {
-				return nil, fnerrors.InternalError("failed to ensure state dir: %v", err)
-			}
-
-			builderConfigs, err := cluster.PrepareServerSideBuildxProxy(ctx, stateDir, []api.BuildPlatform{parsedPlatform}, true, "")
-			if err != nil {
-				return nil, err
-			}
-			if len(builderConfigs) != 1 {
-				return nil, fnerrors.InternalError("expected one builder config, got %d", len(builderConfigs))
-			}
-
-			endpoint := builderConfigs[0].FullBuildkitEndpoint
-			fmt.Fprintf(console.Info(ctx), "buildkit: using server-side build proxy (endpoint: %s)\n", endpoint)
+		stateDir, err := dirs.Ensure(cluster.DetermineStateDir("", cluster.BuildkitProxyPath))
+		if err != nil {
+			return nil, fnerrors.InternalError("failed to ensure state dir: %v", err)
+		}
 
-			isServerSideProxy, err := cluster.TestServerSideBuildxProxyConnectivity(ctx, builderConfigs[0])
-			if err != nil {
-				fmt.Fprintf(console.Warnings(ctx), "buildkit: connectivity check to '%s' failed: %v\n", endpoint, err)
-			}
+		builderConfigs, err := cluster.PrepareServerSideBuildxProxy(ctx, stateDir, []api.BuildPlatform{parsedPlatform}, true, "")
+		if err != nil {
+			return nil, err
+		}
+		if len(builderConfigs) != 1 {
+			return nil, fnerrors.InternalError("expected one builder config, got %d", len(builderConfigs))
+		}
 
-			if !isServerSideProxy {
-				fmt.Fprintf(console.Warnings(ctx), "buildkit: '%s' has connectivity but doesn't seem to be Namespace Build Ingress\n", endpoint)
-			}
+		endpoint := builderConfigs[0].FullBuildkitEndpoint
+		fmt.Fprintf(console.Info(ctx), "buildkit: using server-side build proxy (endpoint: %s)\n", endpoint)
 
-			return useRemoteClusterViaMtls(ctx, builderConfigs[0])
+		isServerSideProxy, err := cluster.TestServerSideBuildxProxyConnectivity(ctx, builderConfigs[0])
+		if err != nil {
+			fmt.Fprintf(console.Warnings(ctx), "buildkit: connectivity check to '%s' failed: %v\n", endpoint, err)
 		}
 
-		bp, err := cluster.NewBuildCluster(ctx, formatPlatformOrDefault(c.platform), "")
-		if err != nil {
-			return nil, err
+		if !isServerSideProxy {
+			fmt.Fprintf(console.Warnings(ctx), "buildkit: '%s' has connectivity but doesn't seem to be Namespace Build Ingress\n", endpoint)
 		}
 
-		return useBuildClusterCluster(ctx, bp)
+		return useRemoteClusterViaMtls(ctx, builderConfigs[0])
 	}
 
 	localAddr, err := EnsureBuildkitd(ctx, c.overrides.ContainerName)

internal/cli/cmd/cluster/buildx.go

@@ -76,7 +76,7 @@ func newSetupBuildxCmd() *cobra.Command {
 	_ = cmd.Flags().MarkHidden("buildkit_sock_path")
 	defaultLoad := cmd.Flags().Bool("default_load", false, "If true, load images to the Docker Engine image store if no other output is specified.")
 	_ = cmd.Flags().MarkHidden("default_load")
-	useServerSideProxy := cmd.Flags().Bool("use_server_side_proxy", false, "If set, buildx is setup to use transparent server-side proxy powered by Namespace")
+	useServerSideProxy := cmd.Flags().Bool("use_server_side_proxy", true, "If set, buildx is setup to use transparent server-side proxy powered by Namespace")
 	_ = cmd.Flags().MarkHidden("use_server_side_proxy")
 
 	cmd.RunE = fncobra.RunE(func(ctx context.Context, args []string) error {
@@ -105,7 +105,7 @@ func newSetupBuildxCmd() *cobra.Command {
 			return err
 		}
 
-		available, serverSideProxyDefault, err := determineAvailable(ctx)
+		available, err := determineAvailable(ctx)
 		if err != nil {
 			return err
 		}
@@ -119,9 +119,7 @@ func newSetupBuildxCmd() *cobra.Command {
 			return err
 		}
 
-		// NSL-3935 use remote-side buildx proxy
-		// This will be soon the default
-		if serverSideProxyDefault || *useServerSideProxy {
+		if *useServerSideProxy {
 			if err := setupServerSideBuildxProxy(ctx, state, *name, *use, *defaultLoad, dockerCli, available, *createAtStartup, *tag); err != nil {
 				return err
 			}
@@ -604,18 +602,18 @@ func newWireBuildxCommand(hidden bool) *cobra.Command {
 	return cmd
 }
 
-func determineAvailable(ctx context.Context) ([]api.BuildPlatform, bool, error) {
+func determineAvailable(ctx context.Context) ([]api.BuildPlatform, error) {
 	profile, err := api.GetProfile(ctx, api.Methods)
 	if err != nil {
-		return nil, false, err
+		return nil, err
 	}
 
 	avail := make([]api.BuildPlatform, len(profile.ClusterPlatform))
 	for k, x := range profile.ClusterPlatform {
 		avail[k] = api.BuildPlatform(x)
 	}
 
-	return avail, profile.BuildxServerSideProxyDefaultHint, nil
+	return avail, nil
 }
 
 func banner(ctx context.Context, name string, use bool, native []api.BuildPlatform, background, serverSideProxy bool) string {

internal/providers/nscloud/api/rpc.go

@@ -359,6 +359,7 @@ func CreateCluster(ctx context.Context, api API, opts CreateClusterOpts) (*Insta
 				fmt.Fprintf(console.Debug(ctx), "[nsc] instance will be removed on exit: %s\n", resp.InstanceId)
 
 				compute.On(ctx).Cleanup(tasks.Action("nscloud.cluster-cleanup"), func(ctx context.Context) error {
+					fmt.Fprintf(console.Debug(ctx), "[nsc] Removing instance for nscloud.cluster-cleanup %s\n", resp.InstanceId)
 					if err := DestroyCluster(ctx, api, MaybeEndpoint(resp.ApiEndpoint), resp.InstanceId); err != nil {
 						// The cluster being gone is an acceptable state (it could have
 						// been deleted by DeleteRecursively for example).

internal/providers/nscloud/api/types.go

@@ -486,9 +486,7 @@ type EnsureBazelCacheResponse struct {
 }
 
 type GetProfileResponse struct {
-	ClusterPlatform                  []string `json:"cluster_platform,omitempty"`
-	BuildxServerSideProxyDefaultHint bool     `json:"buildx_server_side_proxy_default_hint,omitempty"`
-	BuildServerSideProxyHint         bool     `json:"build_server_side_proxy_hint,omitempty"`
+	ClusterPlatform []string `json:"cluster_platform,omitempty"`
 }
 
 type RegisterIngressRequest struct {