Prep for merge

.gitignore

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+go.work
+go.work.sum
 .DS_Store
 .idea/
 *.iml

commands/alpha/alphacmd.go

@@ -20,6 +20,7 @@ import (
 	"github.com/GoogleContainerTools/kpt/commands/alpha/license"
 	"github.com/GoogleContainerTools/kpt/commands/alpha/live"
 	"github.com/GoogleContainerTools/kpt/commands/alpha/repo"
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts"
 	"github.com/GoogleContainerTools/kpt/commands/alpha/rpkg"
 	"github.com/GoogleContainerTools/kpt/commands/alpha/sync"
 	"github.com/GoogleContainerTools/kpt/commands/alpha/wasm"
@@ -54,6 +55,7 @@ func GetCommand(ctx context.Context, name, version string) *cobra.Command {
 		wasm.NewCommand(ctx, version),
 		live.GetCommand(ctx, "", version),
 		license.NewCommand(ctx, version),
+		rollouts.NewCommand(ctx),
 	)
 
 	return alpha

commands/alpha/rollouts/advance/advance.go

@@ -0,0 +1,103 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package advance
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/rolloutsclient"
+	"github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
+	"github.com/spf13/cobra"
+)
+
+func newRunner(ctx context.Context) *runner {
+	r := &runner{
+		ctx: ctx,
+	}
+	c := &cobra.Command{
+		Use:     "advance rollout-name wave-name",
+		Short:   "advances the wave of a progressive rollout",
+		Long:    "advances the wave of a progressive rollout",
+		Example: "advances the wave of a progressive rollout",
+		RunE:    r.runE,
+	}
+	r.Command = c
+	return r
+}
+
+func NewCommand(ctx context.Context) *cobra.Command {
+	return newRunner(ctx).Command
+}
+
+type runner struct {
+	ctx     context.Context
+	Command *cobra.Command
+}
+
+func (r *runner) runE(cmd *cobra.Command, args []string) error {
+	rlc, err := rolloutsclient.New()
+	if err != nil {
+		fmt.Printf("%s\n", err)
+		return err
+	}
+
+	if len(args) == 0 {
+		return fmt.Errorf("must provide rollout name")
+	}
+
+	if len(args) == 1 {
+		return fmt.Errorf("must provide wave name")
+	}
+
+	rolloutName := args[0]
+	waveName := args[1]
+
+	rollout, err := rlc.Get(r.ctx, rolloutName)
+	if err != nil {
+		fmt.Printf("%s\n", err)
+		return err
+	}
+
+	if rollout.Spec.Strategy.Type != v1alpha1.Progressive {
+		return fmt.Errorf("rollout must be using the progressive strategy to use this command")
+	}
+
+	if rollout.Status.WaveStatuses != nil {
+		waveFound := false
+
+		for _, waveStatus := range rollout.Status.WaveStatuses {
+			if waveStatus.Name == waveName {
+				waveFound = true
+				break
+			}
+		}
+
+		if !waveFound {
+			return fmt.Errorf("wave %q not found in this rollout", waveName)
+		}
+	}
+
+	rollout.Spec.Strategy.Progressive.PauseAfterWave.WaveName = waveName
+
+	err = rlc.Update(r.ctx, rollout)
+	if err != nil {
+		fmt.Printf("%s\n", err)
+		return err
+	}
+
+	fmt.Println("done")
+	return nil
+}

commands/alpha/rollouts/get/get.go

@@ -0,0 +1,87 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package get
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/rolloutsclient"
+	rolloutsapi "github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"github.com/spf13/cobra"
+)
+
+func NewCommand(ctx context.Context) *cobra.Command {
+	return newRunner(ctx).Command
+}
+
+func newRunner(ctx context.Context) *runner {
+	r := &runner{
+		ctx: ctx,
+	}
+	c := &cobra.Command{
+		Use:     "get",
+		Short:   "lists rollouts",
+		Long:    "lists rollouts",
+		Example: "lists rollouts",
+		RunE:    r.runE,
+	}
+	r.Command = c
+	return r
+}
+
+type runner struct {
+	ctx     context.Context
+	Command *cobra.Command
+}
+
+func (r *runner) runE(cmd *cobra.Command, args []string) error {
+	rlc, err := rolloutsclient.New()
+	if err != nil {
+		fmt.Printf("%s\n", err)
+		return err
+	}
+
+	rollouts, err := rlc.List(r.ctx, "")
+	if err != nil {
+		fmt.Printf("%s\n", err)
+		return err
+	}
+	renderRolloutsAsTable(cmd, rollouts)
+	return nil
+}
+
+func renderRolloutsAsTable(cmd *cobra.Command, rollouts *rolloutsapi.RolloutList) {
+	t := table.NewWriter()
+	t.SetOutputMirror(cmd.OutOrStdout())
+	t.AppendHeader(table.Row{"ROLLOUT", "STATUS", "CLUSTERS (READY/TOTAL)"})
+	for _, rollout := range rollouts.Items {
+		readyCount := 0
+		for _, cluster := range rollout.Status.ClusterStatuses {
+			if cluster.PackageStatus.Status == "Synced" {
+				readyCount++
+			}
+		}
+		t.AppendRow([]interface{}{
+			rollout.Name,
+			rollout.Status.Overall,
+			fmt.Sprintf("%d/%d", readyCount, len(rollout.Status.ClusterStatuses))})
+	}
+	t.AppendSeparator()
+	// t.AppendRow([]interface{}{300, "Tyrion", "Lannister", 5000})
+	// t.AppendFooter(table.Row{"", "", "Total", 10000})
+	t.Render()
+}

commands/alpha/rollouts/rolloutsclient/client.go

@@ -0,0 +1,123 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rolloutsclient
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	rolloutsapi "github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
+	coreapi "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/cli-utils/pkg/flowcontrol"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
+)
+
+// Client implments client for the rollouts API.
+type Client struct {
+	client client.Client
+}
+
+func New() (*Client, error) {
+	scheme, err := createScheme()
+	if err != nil {
+		return nil, err
+	}
+
+	config := useServerSideThrottling(config.GetConfigOrDie())
+	cl, err := client.New(config, client.Options{
+		Scheme: scheme,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &Client{client: cl}, nil
+}
+
+func createScheme() (*runtime.Scheme, error) {
+	scheme := runtime.NewScheme()
+
+	for _, api := range (runtime.SchemeBuilder{
+		rolloutsapi.AddToScheme,
+		coreapi.AddToScheme,
+		metav1.AddMetaToScheme,
+	}) {
+		if err := api(scheme); err != nil {
+			return nil, err
+		}
+	}
+	return scheme, nil
+}
+
+func (rlc *Client) List(ctx context.Context, ns string) (*rolloutsapi.RolloutList, error) {
+	if ns == "" {
+		ns = "default"
+	}
+
+	rollouts := &rolloutsapi.RolloutList{}
+	if err := rlc.client.List(context.Background(), rollouts, client.InNamespace(ns)); err != nil {
+		return nil, err
+	}
+
+	return rollouts, nil
+}
+
+func (rlc *Client) Get(ctx context.Context, name string) (*rolloutsapi.Rollout, error) {
+	if name == "" {
+		return nil, fmt.Errorf("must provide rollout name")
+	}
+
+	key := types.NamespacedName{
+		Namespace: "default",
+		Name:      name,
+	}
+	rollout := &rolloutsapi.Rollout{}
+	if err := rlc.client.Get(context.Background(), key, rollout); err != nil {
+		return nil, err
+	}
+
+	return rollout, nil
+}
+
+func (rlc *Client) Update(ctx context.Context, rollout *rolloutsapi.Rollout) error {
+	if err := rlc.client.Update(context.Background(), rollout); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func useServerSideThrottling(config *rest.Config) *rest.Config {
+	// Timeout if the query takes too long
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	enabled, err := flowcontrol.IsEnabled(ctx, config)
+	if err != nil {
+		fmt.Printf("Failed to query apiserver to check for flow control enablement: %v\n", err)
+	}
+
+	if enabled {
+		config.QPS = -1
+		config.Burst = -1
+	}
+
+	return config
+}

commands/alpha/rollouts/rolloutscmd.go

@@ -0,0 +1,49 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rollouts
+
+import (
+	"context"
+
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/advance"
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/get"
+	"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/status"
+	"github.com/spf13/cobra"
+)
+
+func NewCommand(ctx context.Context) *cobra.Command {
+	rolloutsCmd := &cobra.Command{
+		Use:   "rollouts",
+		Short: "rollouts",
+		Long:  "rollouts",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			h, err := cmd.Flags().GetBool("help")
+			if err != nil {
+				return err
+			}
+			if h {
+				return cmd.Help()
+			}
+			return cmd.Usage()
+		},
+	}
+
+	rolloutsCmd.AddCommand(
+		advance.NewCommand(ctx),
+		get.NewCommand(ctx),
+		status.NewCommand(ctx),
+	)
+	return rolloutsCmd
+}