Skip to content

Commit

Permalink
fix cmd all
Browse files Browse the repository at this point in the history
  • Loading branch information
@cw-sakamoto
cw-sakamoto committed Dec 11, 2023
1 parent 85d1cb0 commit b6d1c7e
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 70 deletions.
1 change: 1 addition & 0 deletions cmd/cert-manager/cert-manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func NewCertManager(checker *cmd.Checker) (*CertManager, error) {
checker.Chatwork.AddMessage(fmt.Sprintf("cert-manager check application Namespace: %s\n", namespace))

k8sclientset, err := config.NewK8sClientset()

if err != nil {
checker.Logger().Errorf("Error NewK8sClientset: %s ", err)
}
Expand Down
8 changes: 7 additions & 1 deletion cmd/fluent/fluent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,20 @@ func NewFluent(checker *cmd.Checker) (*Fluent, error) {
return nil, err
}

awsConfig, err := config.NewAwsConfig(checker.Ctx)
if err != nil {
checker.Logger().Errorf("NewAwsConfig: %s", err)
return nil, err
}

return &Fluent{
Checker: checker,
Namespace: namespace,
Clientset: k8sclient,
ResourceName: resourceName,
LogBucketName: logBucketName,
LogPath: logPath,
Awscfg: config.NewAwsConfig(checker.Ctx),
Awscfg: awsConfig,
}, nil
}

Expand Down
15 changes: 9 additions & 6 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ package config

import (
"context"
"log"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"k8s.io/client-go/kubernetes"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
)

func NewAwsConfig(ctx context.Context) aws.Config {
func NewAwsConfig(ctx context.Context) (aws.Config, error) {
cfg, err := config.LoadDefaultConfig(ctx)
if err != nil {
log.Printf("unable to load SDK config: %v", err)
return aws.Config{}, err
}
return cfg
return cfg, nil
}

func NewK8sClientset() (*kubernetes.Clientset, error) {
Expand All @@ -27,18 +29,19 @@ func NewK8sClientset() (*kubernetes.Clientset, error) {

clientset, err := kubernetes.NewForConfig(config)
if err != nil {
log.Printf("error kubernetes NewForConfig: %v", err)
return nil, err
}
return clientset, nil
}

func NewK8sClient(options client.Options) (client.Client, error) {
// https://github.com/kubernetes-sigs/controller-runtime/blob/main/pkg/log/log.go#L58
log.SetLogger(zap.New(zap.UseDevMode(true)))

config := ctrl.GetConfigOrDie()
c, err := client.New(config, options)

if err != nil {
log.Printf("error kubernetes client: %v", err)
return nil, err
}
return c, nil
Expand Down
3 changes: 3 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand Down Expand Up @@ -69,6 +70,8 @@ require (
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
Expand Down
21 changes: 21 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.25.4 h1:yEvZ4neOQ/KpUqyR+X0ycUTW/kVR
github.com/aws/aws-sdk-go-v2/service/sts v1.25.4/go.mod h1:feTnm2Tk/pJxdX+eooEsxvlvTWBvDm6CasRZ+JOs2IY=
github.com/aws/smithy-go v1.17.0 h1:wWJD7LX6PBV6etBUwO0zElG0nWN9rUhp0WdYeHSHAaI=
github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/cert-manager/cert-manager v1.13.2 h1:LG8+OLvxtc49CSyfjW7zHSyvlt7JVaHgRGyhfdvPpkk=
Expand Down Expand Up @@ -110,6 +113,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
Expand Down Expand Up @@ -169,26 +173,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
Expand All @@ -197,15 +210,20 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -216,9 +234,11 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand All @@ -234,6 +254,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
Expand Down
126 changes: 63 additions & 63 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package main

import (
"context"
"fmt"
"os"
"os/signal"
"runtime"
Expand Down Expand Up @@ -50,9 +49,10 @@ func main() {

var ctx context.Context

var ingressClassName string
var noDnsCheck bool

clusterName := os.Getenv("CLUSTER_NAME")

var rootCmd = &cobra.Command{
Use: "kibertas",
SilenceUsage: true,
Expand All @@ -73,7 +73,7 @@ func main() {
Short: "test cluster-autoscaler",
Long: "test cluster-autoscaler",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
checker = cmd.NewChecker(ctx, debug, logger, chatwork, time.Duration(timeout)*time.Minute)
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
ca, err := clusterautoscaler.NewClusterAutoscaler(checker)
if err != nil {
return err
Expand All @@ -87,8 +87,8 @@ func main() {
Short: "test ingress",
Long: "test ingress(ingress-controller, external-dns)",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
checker = cmd.NewChecker(ctx, debug, logger, chatwork, time.Duration(timeout)*time.Minute)
i, err := ingress.NewIngress(checker, noDnsCheck, ingressClassName)
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
i, err := ingress.NewIngress(checker, noDnsCheck)
if err != nil {
return err
}
Expand All @@ -101,7 +101,7 @@ func main() {
Short: "test fluent(fluent-bit, fluentd)",
Long: "test fluent(fluent-bit, fluentd)",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
checker = cmd.NewChecker(ctx, debug, logger, chatwork, time.Duration(timeout)*time.Minute)
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
f, err := fluent.NewFluent(checker)
if err != nil {
return err
Expand All @@ -115,7 +115,7 @@ func main() {
Short: "test datadog-agent",
Long: "test datadog-agent",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
checker = cmd.NewChecker(ctx, debug, logger, chatwork, time.Duration(timeout)*time.Minute)
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
da, err := datadogagent.NewDatadogAgent(checker)
if err != nil {
return err
Expand All @@ -129,7 +129,7 @@ func main() {
Short: "test cert-manager",
Long: "test cert-manager",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
checker = cmd.NewChecker(ctx, debug, logger, chatwork, time.Duration(timeout)*time.Minute)
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
cm, err := certmanager.NewCertManager(checker)
if err != nil {
return err
Expand All @@ -138,56 +138,59 @@ func main() {
},
}

/*
var cmdAll = &cobra.Command{
Use: "all",
Short: "test all application",
Long: "test all application",
RunE: func(cmd *cobra.Command, args []string) error {
logger().Info("test all application")
i, err := ingress.NewIngress(debug, logger, chatwork, noDnsCheck, ingressClassName)
if err != nil {
return err
}
err = i.Check()
if err != nil {
return err
}
ca, err := clusterautoscaler.NewClusterAutoscaler(debug, logger, chatwork)
if err != nil {
return err
}
err = ca.Check()
if err != nil {
return err
}
cm, err := certmanager.NewCertManager(debug, logger, chatwork)
if err != nil {
return err
}
err = cm.Check()
if err != nil {
return err
}
f, err := fluent.NewFluent(debug, logger, chatwork)
if err != nil {
return err
}
err = f.Check()
if err != nil {
return err
}
return nil
},
}
*/
var cmdAll = &cobra.Command{
Use: "all",
Short: "test all application",
Long: "test all application",
RunE: func(cobra_cmd *cobra.Command, args []string) error {
logger().Info("test all application")
checker = cmd.NewChecker(ctx, debug, logger, chatwork, clusterName, time.Duration(timeout)*time.Minute)
ca, err := clusterautoscaler.NewClusterAutoscaler(checker)
if err != nil {
return err
}
if err := ca.Check(); err != nil {
return err
}

//checker.Chatwork = initChatwork(logger)
i, err := ingress.NewIngress(checker, false)
if err != nil {
return err
}
if err := i.Check(); err != nil {
return err
}

//checker.Chatwork = initChatwork(logger)
f, err := fluent.NewFluent(checker)
if err != nil {
return err
}
if err := f.Check(); err != nil {
return err
}

//checker.Chatwork = initChatwork(logger)
da, err := datadogagent.NewDatadogAgent(checker)
if err != nil {
return err
}
if err := da.Check(); err != nil {
return err
}

//checker.Chatwork = initChatwork(logger)
cm, err := certmanager.NewCertManager(checker)
if err != nil {
return err
}
if err := cm.Check(); err != nil {
return err
}
return nil
},
}

rootCmd.AddCommand(cmdTest)
rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 15, "Check timeout. If you want to change the timeout, please specify the number of minutes.")
Expand All @@ -206,16 +209,16 @@ func main() {
ctx = newSignalContext(logger, chatwork)

cmdIngress.Flags().BoolVar(&noDnsCheck, "no-dns-check", false, "This is a flag for the dns check. If you want to skip the dns check, please specify false.(default: false)")
cmdIngress.Flags().StringVar(&ingressClassName, "ingress-class-name", "alb", "This is a flag for the ingress class name. If you want to change the ingress class name, please specify the name.(default: alb)")

//cmdTest.AddCommand(cmdAll)
cmdTest.AddCommand(cmdAll)
cmdTest.AddCommand(cmdFluent)
cmdTest.AddCommand(cmdClusterAutoscaler)
cmdTest.AddCommand(cmdIngress)
cmdTest.AddCommand(cmdCertManager)
cmdTest.AddCommand(cmdDatadogAgent)

if err := rootCmd.Execute(); err != nil {
chatwork.AddMessage("Error: " + err.Error() + "\n")
logger().Fatal("Error: ", err)
}
}
Expand All @@ -239,11 +242,8 @@ func newSignalContext(logger func() *logrus.Entry, chatwork *notify.Chatwork) co
func initChatwork(logger func() *logrus.Entry) *notify.Chatwork {
apiToken := os.Getenv("CHATWORK_API_TOKEN")
roomId := os.Getenv("CHATWORK_ROOM_ID")
clusterName := os.Getenv("CLUSTER_NAME")
chatwork := notify.NewChatwork(apiToken, roomId, logger)
location, _ := time.LoadLocation("Asia/Tokyo")

chatwork.AddMessage(fmt.Sprintf("kibertas start in %s at %s\n", clusterName, time.Now().In(location).Format("2006-01-02 15:04:05")))
return chatwork
}

Expand Down

0 comments on commit b6d1c7e

Please sign in to comment.