Skip to content

Commit

Permalink
Rollouts cli command (#3807)
Browse files Browse the repository at this point in the history
* kpt cli: added rollouts subcommand (#3752)

* kpt cli: added rollouts subcommand

* fixed license check for k8s.io/klog

* fixed linter warnings in rollouts cli

* bumped up rollouts pkg and other deps
  • Loading branch information
droot authored Feb 13, 2023
1 parent 62ef121 commit ac0ac92
Show file tree
Hide file tree
Showing 17 changed files with 309 additions and 371 deletions.
2 changes: 2 additions & 0 deletions commands/alpha/alphacmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/rolloutsclient"
"github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
"github.com/GoogleContainerTools/kpt/rollouts/rolloutsclient"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -55,11 +55,11 @@ func (r *runner) runE(cmd *cobra.Command, args []string) error {
}

if len(args) == 0 {
return fmt.Errorf("must provide rollout name\n")
return fmt.Errorf("must provide rollout name")
}

if len(args) == 1 {
return fmt.Errorf("must provide wave name\n")
return fmt.Errorf("must provide wave name")
}

rolloutName := args[0]
Expand All @@ -72,7 +72,7 @@ func (r *runner) runE(cmd *cobra.Command, args []string) error {
}

if rollout.Spec.Strategy.Type != v1alpha1.Progressive {
return fmt.Errorf("rollout must be using the progressive strategy to use this command\n")
return fmt.Errorf("rollout must be using the progressive strategy to use this command")
}

if rollout.Status.WaveStatuses != nil {
Expand All @@ -86,7 +86,7 @@ func (r *runner) runE(cmd *cobra.Command, args []string) error {
}

if !waveFound {
return fmt.Errorf("wave %q not found in this rollout\n", waveName)
return fmt.Errorf("wave %q not found in this rollout", waveName)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/rolloutsclient"
rolloutsapi "github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
"github.com/GoogleContainerTools/kpt/rollouts/rolloutsclient"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/spf13/cobra"
)
Expand Down
123 changes: 123 additions & 0 deletions commands/alpha/rollouts/rolloutsclient/client.go
Original file line number Diff line number Diff line change
@@ -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
}
24 changes: 9 additions & 15 deletions rollouts/cli/main.go → commands/alpha/rollouts/rolloutscmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package main
package rollouts

import (
"context"
"os"

"github.com/GoogleContainerTools/kpt/rollouts/cli/advance"
"github.com/GoogleContainerTools/kpt/rollouts/cli/get"
"github.com/GoogleContainerTools/kpt/rollouts/cli/status"
"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"
_ "k8s.io/client-go/plugin/pkg/client/auth"
)

func main() {
ctx := context.Background()

func NewCommand(ctx context.Context) *cobra.Command {
rolloutsCmd := &cobra.Command{
Use: "cli",
Short: "cli ",
Long: "cli",
Use: "rollouts",
Short: "rollouts",
Long: "rollouts",
RunE: func(cmd *cobra.Command, args []string) error {
h, err := cmd.Flags().GetBool("help")
if err != nil {
Expand All @@ -49,7 +45,5 @@ func main() {
get.NewCommand(ctx),
status.NewCommand(ctx),
)
if err := rolloutsCmd.Execute(); err != nil {
os.Exit(-1)
}
return rolloutsCmd
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/GoogleContainerTools/kpt/commands/alpha/rollouts/rolloutsclient"
rolloutsapi "github.com/GoogleContainerTools/kpt/rollouts/api/v1alpha1"
"github.com/GoogleContainerTools/kpt/rollouts/rolloutsclient"
"github.com/spf13/cobra"

"github.com/jedib0t/go-pretty/v6/table"
Expand Down
41 changes: 23 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,44 @@ go 1.18

require (
github.com/GoogleContainerTools/kpt/porch/api v0.0.0-20230121152246-dc44dbd18a33
github.com/GoogleContainerTools/kpt/rollouts v0.0.0-20230209223911-c6c49d0a0636
github.com/bytecodealliance/wasmtime-go v0.39.0
github.com/cpuguy83/go-md2man/v2 v2.0.2
github.com/go-errors/errors v1.4.2
github.com/google/go-cmp v0.5.9
github.com/google/go-containerregistry v0.11.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/igorsobreira/titlecase v0.0.0-20140109233139-4156b5b858ac
github.com/jedib0t/go-pretty/v6 v6.4.4
github.com/otiai10/copy v1.7.0
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
github.com/prep/wasmexec v0.0.0-20220807105708-6554945c1dec
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.1
github.com/xlab/treeprint v1.1.0
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
golang.org/x/mod v0.7.0
golang.org/x/text v0.4.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools v2.2.0+incompatible
k8s.io/api v0.25.3
k8s.io/apiextensions-apiserver v0.25.3
k8s.io/apimachinery v0.25.3
k8s.io/apimachinery v0.25.4
k8s.io/cli-runtime v0.25.3
k8s.io/client-go v0.25.3
k8s.io/component-base v0.25.3
k8s.io/klog/v2 v2.70.1
k8s.io/klog/v2 v2.80.1
k8s.io/kubectl v0.25.3
sigs.k8s.io/cli-utils v0.34.0
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/controller-runtime v0.13.1
sigs.k8s.io/kustomize/api v0.12.1
sigs.k8s.io/kustomize/kyaml v0.13.9
sigs.k8s.io/yaml v1.3.0
)

require (
cloud.google.com/go/compute v1.7.0 // indirect
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
Expand Down Expand Up @@ -68,9 +71,9 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/imdario/mergo v0.3.12 // indirect
Expand All @@ -82,9 +85,10 @@ require (
github.com/kr/pretty v0.2.1 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -97,26 +101,27 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spyzhov/ajson v0.7.1 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
go.starlark.net v0.0.0-20210901212718-87f333178d59 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/term v0.2.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit ac0ac92

Please sign in to comment.