diff --git a/cmd/agent/root.go b/cmd/agent/root.go index 05c32b8..f829221 100644 --- a/cmd/agent/root.go +++ b/cmd/agent/root.go @@ -8,10 +8,8 @@ import ( "github.com/mariadb-operator/agent/pkg/filemanager" "github.com/mariadb-operator/agent/pkg/handler" - "github.com/mariadb-operator/agent/pkg/handler/bootstrap" "github.com/mariadb-operator/agent/pkg/handler/recovery" "github.com/mariadb-operator/agent/pkg/logger" - "github.com/mariadb-operator/agent/pkg/mariadbd" "github.com/mariadb-operator/agent/pkg/router" "github.com/mariadb-operator/agent/pkg/server" "github.com/spf13/cobra" @@ -30,13 +28,8 @@ var ( logTimeEncoder string logDev bool - bootstrapMariadbdReloadRetries int - bootstrapMariadbdReloadRetryWait time.Duration - - recoveryMariadbdReloadRetries int - recoveryMariadbdReloadRetryWait time.Duration - recoveryRetries int - recoveryRetryWait time.Duration + recoveryRetries int + recoveryRetryWait time.Duration ) var rootCmd = &cobra.Command{ @@ -62,17 +55,7 @@ var rootCmd = &cobra.Command{ handlerLogger := logger.WithName("handler") handler := handler.NewHandler(fileManager, &handlerLogger, - handler.WithBootstrapOptions( - bootstrap.WithMariadbdReload(&mariadbd.ReloadOptions{ - Retries: bootstrapMariadbdReloadRetries, - WaitRetry: bootstrapMariadbdReloadRetryWait, - }), - ), handler.WithRecoveryOptions( - recovery.WithMariadbdReload(&mariadbd.ReloadOptions{ - Retries: recoveryMariadbdReloadRetries, - WaitRetry: recoveryMariadbdReloadRetryWait, - }), recovery.WithRecovery(&recovery.RecoveryOptions{ Retries: recoveryRetries, WaitRetry: recoveryRetryWait, @@ -114,15 +97,6 @@ func init() { "epoch, millis, nano, iso8601, rfc3339 or rfc3339nano") rootCmd.Flags().BoolVar(&logDev, "log-dev", false, "Enable development logs.") - rootCmd.Flags().IntVar(&bootstrapMariadbdReloadRetries, "bootstrap-mariadbd-reload-retries", 10, "Maximum number of attempts "+ - "to reload MariaDB process when bootstraping a new Galera cluster") - rootCmd.Flags().DurationVar(&bootstrapMariadbdReloadRetryWait, "bootstrap-mariadbd-reload-retry-wait", 1*time.Second, - "Time to wait between MariaDB process reload attempts when bootstrapping a new Galera cluster") - - rootCmd.Flags().IntVar(&recoveryMariadbdReloadRetries, "recovery-mariadbd-reload-retries", 3, "Maximum number of attempts "+ - "to reload MariaDB process when recovering the Galera cluster") - rootCmd.Flags().DurationVar(&recoveryMariadbdReloadRetryWait, "recovery-mariadbd-reload-retry-wait", 1*time.Second, - "Time to wait between MariaDB process reload attempts when recovering the Galera cluster") rootCmd.Flags().IntVar(&recoveryRetries, "recovery-retries", 10, "Maximum number of attempts "+ "to recover the Galera cluster") rootCmd.Flags().DurationVar(&recoveryRetryWait, "recovery-retry-wait", 3*time.Second, "Time to wait between "+ diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 7e716af..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: "3.3" - -services: - mariadb: - container_name: mariadb - image: mariadb:10.11.3 - pid: host - command: - - bash - - -c - - /scripts/galera.sh - restart: unless-stopped - environment: - - HOSTNAME=mariadb-0 - - MYSQL_TCP_PORT=3306 - - MARIADB_ROOT_PASSWORD=mariadb - - MARIADB_DATABASE=mariadb - - MARIADB_USER=mariadb - - MARIADB_PASSWORD=mariadb - ports: - - "3306" - - "4444" - - "4567" - - "4568" - volumes: - - ./hack/galera.sh:/scripts/galera.sh - - ./mariadb/config/docker:/etc/mysql/mariadb.conf.d - - ./mariadb/state/docker:/var/lib/mysql \ No newline at end of file diff --git a/examples/1-bootstrap.cnf b/examples/1-bootstrap.cnf deleted file mode 100644 index e6db0a6..0000000 --- a/examples/1-bootstrap.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[galera] -wsrep_new_cluster="ON" diff --git a/examples/2-recovery.cnf b/examples/2-recovery.cnf deleted file mode 100644 index d342c9c..0000000 --- a/examples/2-recovery.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[galera] -log_error=mariadb.err -wsrep_recover="ON" diff --git a/examples/grastate-recovery.dat b/examples/grastate-recovery.dat deleted file mode 100644 index 348b3b0..0000000 --- a/examples/grastate-recovery.dat +++ /dev/null @@ -1,4 +0,0 @@ -version: 2.1 -uuid: 220dcdcb-1629-11e4-add3-aec059ad3734 -seqno: -1 -safe_to_bootstrap: 0 \ No newline at end of file diff --git a/examples/grastate-safe-bootstrap.dat b/examples/grastate-safe-bootstrap.dat deleted file mode 100644 index 77b603e..0000000 --- a/examples/grastate-safe-bootstrap.dat +++ /dev/null @@ -1,4 +0,0 @@ -version: 2.1 -uuid: 220dcdcb-1629-11e4-add3-aec059ad3734 -seqno: -1 -safe_to_bootstrap: 1 \ No newline at end of file diff --git a/examples/grastate-seqno.dat b/examples/grastate-seqno.dat deleted file mode 100644 index 201cae7..0000000 --- a/examples/grastate-seqno.dat +++ /dev/null @@ -1,4 +0,0 @@ -version: 2.1 -uuid: 220dcdcb-1629-11e4-add3-aec059ad3734 -seqno: 1122 -safe_to_bootstrap: 0 \ No newline at end of file diff --git a/go.mod b/go.mod index 32eae71..61d67a2 100644 --- a/go.mod +++ b/go.mod @@ -6,16 +6,16 @@ require ( github.com/go-chi/chi/v5 v5.0.8 github.com/go-chi/httprate v0.7.4 github.com/go-logr/logr v1.2.4 + github.com/google/uuid v1.3.0 github.com/mitchellh/go-ps v1.0.0 github.com/spf13/cobra v1.7.0 go.uber.org/zap v1.24.0 - sigs.k8s.io/controller-runtime v0.15.0 - github.com/google/uuid v1.3.0 + sigs.k8s.io/controller-runtime v0.12.3 ) require ( - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/go-logr/zapr v1.2.4 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/go-logr/zapr v1.2.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -25,13 +25,13 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/text v0.3.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.27.2 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + k8s.io/apimachinery v0.24.2 // indirect + k8s.io/klog/v2 v2.60.1 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect ) diff --git a/go.sum b/go.sum index 13809ab..a077ba8 100644 --- a/go.sum +++ b/go.sum @@ -1,123 +1,284 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0= github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/httprate v0.7.4 h1:a2GIjv8he9LRf3712zxxnRdckQCm7I8y8yQhkJ84V6M= github.com/go-chi/httprate v0.7.4/go.mod h1:6GOYBSwnpra4CQfAKXu8sQZg+nZ0M1g9QnyFvxrAB8A= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= -github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= +github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= +github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= 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.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= 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 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= 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.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= 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-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 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/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= 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.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/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-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= 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/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= 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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= -k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU= -sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= +k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= +k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= +sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/hack/config/kind.yaml b/hack/config/kind.yaml new file mode 100644 index 0000000..581c820 --- /dev/null +++ b/hack/config/kind.yaml @@ -0,0 +1,13 @@ + +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + image: kindest/node:v1.26.0 + extraMounts: + - hostPath: ./mariadb/config + containerPath: /etc/mysql/mariadb.conf.d + propagation: Bidirectional + - hostPath: ./mariadb/state + containerPath: /var/lib/mysql + propagation: Bidirectional \ No newline at end of file diff --git a/hack/config/services.yaml b/hack/config/services.yaml new file mode 100644 index 0000000..64ee944 --- /dev/null +++ b/hack/config/services.yaml @@ -0,0 +1,45 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb + name: mariadb +spec: + type: ClusterIP + ports: + - name: mysql + port: 3306 + protocol: TCP + targetPort: 3306 + selector: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb + name: mariadb-headless +spec: + type: ClusterIP + ports: + - name: cluster + port: 4444 + protocol: TCP + targetPort: 4444 + - name: ist + port: 4567 + protocol: TCP + targetPort: 4567 + - name: sst + port: 4568 + protocol: TCP + targetPort: 4568 + clusterIP: None + publishNotReadyAddresses: true + selector: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb diff --git a/hack/config/statefulset.yaml b/hack/config/statefulset.yaml new file mode 100644 index 0000000..6da8487 --- /dev/null +++ b/hack/config/statefulset.yaml @@ -0,0 +1,99 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + labels: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb + name: mariadb +spec: + selector: + matchLabels: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb + serviceName: mariadb-headless + template: + metadata: + labels: + app.kubernetes.io/instance: mariadb + app.kubernetes.io/name: mariadb + name: mariadb + spec: + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + containers: + - name: mariadb + image: mariadb:10.11.3 + imagePullPolicy: IfNotPresent + command: + - bash + - -c + - /scripts/entrypoint.sh + env: + - name: MYSQL_TCP_PORT + value: "3306" + - name: MARIADB_ROOT_PASSWORD + value: mariadb + - name: MARIADB_ROOT_HOST + value: "%" + - name: MARIADB_DATABASE + value: mariadb + - name: MARIADB_USER + value: mariadb + - name: MARIADB_PASSWORD + value: mariadb + livenessProbe: + exec: + command: + - bash + - -c + - mysql -u root -p${MARIADB_ROOT_PASSWORD} -e "SHOW STATUS LIKE 'wsrep_ready'" | grep -c ON + initialDelaySeconds: 30 + timeoutSeconds: 5 + periodSeconds: 10 + readinessProbe: + exec: + command: + - bash + - -ec + - mysql -u root -p${MARIADB_ROOT_PASSWORD} -e "SELECT 1;" + initialDelaySeconds: 30 + timeoutSeconds: 5 + periodSeconds: 10 + ports: + - containerPort: 3306 + protocol: TCP + - containerPort: 4444 + protocol: TCP + - containerPort: 4567 + protocol: TCP + - containerPort: 4568 + protocol: TCP + resources: + limits: + cpu: 300m + memory: 512Mi + requests: + cpu: 100m + memory: 128Mi + volumeMounts: + - name: scripts + mountPath: /scripts + - name: config + mountPath: /etc/mysql/mariadb.conf.d + - name: state + mountPath: /var/lib/mysql + volumes: + - name: scripts + configMap: + name: scripts + defaultMode: 0777 + - name: config + hostPath: + path: /etc/mysql/mariadb.conf.d + type: Directory + - name: state + hostPath: + path: /var/lib/mysql + type: Directory + \ No newline at end of file diff --git a/hack/galera.sh b/hack/entrypoint.sh similarity index 88% rename from hack/galera.sh rename to hack/entrypoint.sh index 0fd8320..9300161 100755 --- a/hack/galera.sh +++ b/hack/entrypoint.sh @@ -2,11 +2,6 @@ set -e -if [ -z "$HOSTNAME" ]; then - echo "HOSTNAME environment variable not set" - exit 1 -fi - if [ -z "$ENTRYPOINT" ]; then ENTRYPOINT="/usr/local/bin/docker-entrypoint.sh" fi diff --git a/hack/mariadb-delete.sh b/hack/mariadb-delete.sh new file mode 100755 index 0000000..d46c85a --- /dev/null +++ b/hack/mariadb-delete.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +kubectl delete configmap scripts +kubectl delete -f hack/config/services.yaml +kubectl delete -f hack/config/statefulset.yaml + +rm -rf mariadb/config/* +rm -rf mariadb/state/* \ No newline at end of file diff --git a/hack/mariadb.sh b/hack/mariadb.sh new file mode 100755 index 0000000..02f2528 --- /dev/null +++ b/hack/mariadb.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -e + +kubectl create configmap scripts --from-file=entrypoint.sh=hack/entrypoint.sh --dry-run=client -o yaml | kubectl apply -f - +kubectl apply -f hack/config/services.yaml +kubectl apply -f hack/config/statefulset.yaml + +sudo chown -R $(id -u):$(id -g) mariadb \ No newline at end of file diff --git a/make/deploy.mk b/make/deploy.mk index a14bfd9..8c435b6 100644 --- a/make/deploy.mk +++ b/make/deploy.mk @@ -1,7 +1,10 @@ +CLUSTER ?= agent +CLUSTER_OPERATOR ?= mdb + ##@ Docker PLATFORM ?= linux/amd64,linux/arm64 -IMG ?= ghcr.io/mariadb-operator/agent:latest +IMG ?= ghcr.io/mariadb-operator/agent:v0.0.1 BUILDX ?= docker buildx build --platform $(PLATFORM) -t $(IMG) BUILDER ?= agent @@ -25,21 +28,33 @@ docker-push: ## Build multi-arch docker image and push it to the registry. docker-inspect: ## Inspect docker image. docker buildx imagetools inspect $(IMG) -##@ MariaDB +.PHONY: docker-load +docker-load: ## Load docker image in KIND. + kind load docker-image --name ${CLUSTER_OPERATOR} ${IMG} -.PHONY: mariadb -mariadb: ## Create a MariaDB galera cluster using docker compose. - docker compose up -d +##@ Cluster + +KIND_CONFIG ?= hack/config/kind.yaml +KIND_IMAGE ?= kindest/node:v1.26.0 + +.PHONY: cluster +cluster: kind ## Create the kind cluster. + $(KIND) create cluster --name $(CLUSTER) --config $(KIND_CONFIG) -.PHONY: mariadb-rm -mariadb-rm: ## Remove the MariaDB galera cluster. - docker compose rm --stop --force - sudo rm -rf mariadb +.PHONY: cluster-delete +cluster-delete: kind ## Delete the kind cluster. + $(KIND) delete cluster --name $(CLUSTER) -.PHONY: mariadb-logs -mariadb-logs: ## Check the MariaDB galera cluster logs. - docker compose logs --follow +.PHONY: cluster-ctx +cluster-ctx: ## Sets cluster context. + @kubectl config use-context kind-$(CLUSTER) + +##@ MariaDB + +.PHONY: mariadb +mariadb: ## Create a MariaDB galera in kind. + @./hack/mariadb.sh -.PHONY: mariadb-ps -mariadb-ps: ## Check the MariaDB processes. - ps -ef | grep mariadbd \ No newline at end of file +.PHONY: mariadb-delete +mariadb-delete: ## Delete the MariaDB galera cluster. + @./hack/mariadb-delete.sh diff --git a/make/dev.mk b/make/dev.mk index 3f8c26d..36bfaf2 100644 --- a/make/dev.mk +++ b/make/dev.mk @@ -20,29 +20,7 @@ cover: test ## Run tests and generate coverage. release: goreleaser ## Test release locally. $(GORELEASER) release --snapshot --rm-dist -CONFIG_DIR ?= mariadb/config/local -CONFIG_FILE ?= 1-bootstrap.cnf -.PHONY: config -config: ## Copies a example config file for development purposes. - @mkdir -p $(CONFIG_DIR) - cp "examples/$(CONFIG_FILE)" $(CONFIG_DIR) - -STATE_DIR ?= mariadb/state/local -STATE_FILE ?= grastate-recovery.dat -.PHONY: state -state: ## Copies a example state file for development purposes. - @mkdir -p $(STATE_DIR) - cp "examples/$(STATE_FILE)" "$(STATE_DIR)/grastate.dat" - -BASE_RUN_FLAGS ?= --log-level=debug --log-dev - -RUN_FLAGS ?= $(BASE_RUN_FLAGS) --config-dir=$(CONFIG_DIR) --state-dir=$(STATE_DIR) +RUN_FLAGS ?= --log-level=debug --log-dev --config-dir=mariadb/config --state-dir=mariadb/state .PHONY: run -run: config state ## Run agent from your host. - go run main.go $(RUN_FLAGS) - -AGENT ?= $(LOCALBIN)/agent -SU_RUN_FLAGS ?= $(BASE_RUN_FLAGS) --config-dir=mariadb/config/docker --state-dir=mariadb/state/docker -.PHONY: su-run -su-run: build ## Run agent from your host as root to be able to access mariadb volumes and process. - sudo $(AGENT) $(SU_RUN_FLAGS) \ No newline at end of file +run: ## Run agent from your host. + go run main.go $(RUN_FLAGS) \ No newline at end of file diff --git a/make/tooling.mk b/make/tooling.mk index 5c3886d..4d56b20 100644 --- a/make/tooling.mk +++ b/make/tooling.mk @@ -8,10 +8,12 @@ $(LOCALBIN): ## Tool Binaries GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint GORELEASER ?= $(LOCALBIN)/goreleaser +KIND ?= $(LOCALBIN)/kind ## Tool Versions GOLANGCI_LINT_VERSION ?= v1.52.2 GORELEASER_VERSION ?= v1.18.2 +KIND_VERSION ?= v0.17.0 .PHONY: golangci-lint golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary. @@ -21,4 +23,9 @@ $(GOLANGCI_LINT): $(LOCALBIN) .PHONY: goreleaser goreleaser: $(GORELEASER) ## Download goreleaser locally if necessary. $(GORELEASER): $(LOCALBIN) - GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) \ No newline at end of file + GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) + +.PHONY: kind +kind: $(KIND) ## Download kind locally if necessary. +$(KIND): $(LOCALBIN) + GOBIN=$(LOCALBIN) go install sigs.k8s.io/kind@$(KIND_VERSION) \ No newline at end of file diff --git a/pkg/client/bootstrap.go b/pkg/client/bootstrap.go new file mode 100644 index 0000000..c504791 --- /dev/null +++ b/pkg/client/bootstrap.go @@ -0,0 +1,28 @@ +package client + +import ( + "context" + "net/http" + + "github.com/mariadb-operator/agent/pkg/galera" +) + +type Bootstrap struct { + *Client +} + +func (b *Bootstrap) Enable(ctx context.Context, bootstrap *galera.Bootstrap) error { + req, err := b.newRequestWithContext(ctx, http.MethodPut, "/api/bootstrap", bootstrap) + if err != nil { + return err + } + return b.do(req, nil) +} + +func (b *Bootstrap) Disable(ctx context.Context, bootstrap *galera.Bootstrap) error { + req, err := b.newRequestWithContext(ctx, http.MethodDelete, "/api/bootstrap", nil) + if err != nil { + return err + } + return b.do(req, nil) +} diff --git a/pkg/client/client.go b/pkg/client/client.go new file mode 100644 index 0000000..e0f65a5 --- /dev/null +++ b/pkg/client/client.go @@ -0,0 +1,116 @@ +package client + +import ( + "encoding/json" + "fmt" + "net/http" + "net/url" + "time" + + "github.com/mariadb-operator/agent/pkg/errors" +) + +const ( + defaultBaseUrl = "http://localhost:5555" + jsonMediaType = "application/json" +) + +type Option func(*Client) error + +func WithBaseURL(baseUrl *url.URL) Option { + return func(c *Client) error { + _, err := url.Parse(baseUrl.String()) + if err != nil { + return fmt.Errorf("error parsing base URL: %v", err) + } + + c.baseUrl = baseUrl + return nil + } +} + +func WithHTTPClient(httpClient *http.Client) Option { + return func(c *Client) error { + if httpClient == nil { + httpClient = http.DefaultClient + } + + c.httpClient = httpClient + return nil + } +} + +func WithTimeout(timeout time.Duration) Option { + return func(c *Client) error { + if timeout == 0 { + timeout = 1 * time.Minute + } + + c.httpClient.Timeout = timeout + return nil + } +} + +type Client struct { + Bootstrap *Bootstrap + GaleraState *GaleraState + Recovery *Recovery + + baseUrl *url.URL + httpClient *http.Client + headers map[string]string +} + +func NewClient(opts ...Option) (*Client, error) { + baseUrl, err := url.Parse(defaultBaseUrl) + if err != nil { + return nil, fmt.Errorf("error parsing base URL: %v", err) + } + + client := &Client{ + baseUrl: baseUrl, + httpClient: http.DefaultClient, + headers: make(map[string]string, 0), + } + for _, setOpt := range opts { + if err := setOpt(client); err != nil { + return nil, fmt.Errorf("error setting option: %v", err) + } + } + + client.Bootstrap = &Bootstrap{ + Client: client, + } + client.GaleraState = &GaleraState{ + Client: client, + } + client.Recovery = &Recovery{ + Client: client, + } + return client, nil +} + +func (c *Client) do(req *http.Request, v interface{}) error { + res, err := c.httpClient.Do(req) + if err != nil { + return fmt.Errorf("error doing request: %v", err) + } + defer res.Body.Close() + decoder := json.NewDecoder(res.Body) + + if res.StatusCode >= 400 { + var apiErr errors.APIError + if err := decoder.Decode(&apiErr); err != nil { + return fmt.Errorf("error decoding body into error: %v", err) + } + return errors.NewError(res.StatusCode, apiErr.Error()) + } + + if v == nil { + return nil + } + if err := decoder.Decode(&v); err != nil { + return fmt.Errorf("error decoding body: %v", err) + } + return nil +} diff --git a/pkg/client/galerastate.go b/pkg/client/galerastate.go new file mode 100644 index 0000000..ec6ac09 --- /dev/null +++ b/pkg/client/galerastate.go @@ -0,0 +1,24 @@ +package client + +import ( + "context" + "net/http" + + "github.com/mariadb-operator/agent/pkg/galera" +) + +type GaleraState struct { + *Client +} + +func (g *GaleraState) Get(ctx context.Context) (*galera.GaleraState, error) { + req, err := g.newRequestWithContext(ctx, http.MethodGet, "/api/galerastate", nil) + if err != nil { + return nil, err + } + var galeraState galera.GaleraState + if err := g.do(req, &galeraState); err != nil { + return nil, err + } + return &galeraState, nil +} diff --git a/pkg/client/recovery.go b/pkg/client/recovery.go new file mode 100644 index 0000000..678a035 --- /dev/null +++ b/pkg/client/recovery.go @@ -0,0 +1,40 @@ +package client + +import ( + "context" + "net/http" + + "github.com/mariadb-operator/agent/pkg/galera" +) + +type Recovery struct { + *Client +} + +func (r *Recovery) Enable(ctx context.Context) (*galera.Bootstrap, error) { + req, err := r.newRequestWithContext(ctx, http.MethodPut, "/api/recovery", nil) + if err != nil { + return nil, err + } + var bootstrap galera.Bootstrap + if err := r.do(req, &bootstrap); err != nil { + return nil, err + } + return &bootstrap, nil +} + +func (r *Recovery) Start(ctx context.Context) error { + req, err := r.newRequestWithContext(ctx, http.MethodPost, "/api/recovery", nil) + if err != nil { + return err + } + return r.do(req, nil) +} + +func (r *Recovery) Disable(ctx context.Context) error { + req, err := r.newRequestWithContext(ctx, http.MethodDelete, "/api/recovery", nil) + if err != nil { + return err + } + return r.do(req, nil) +} diff --git a/pkg/client/request.go b/pkg/client/request.go new file mode 100644 index 0000000..225b445 --- /dev/null +++ b/pkg/client/request.go @@ -0,0 +1,65 @@ +package client + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "net/http" + "net/url" + "strings" +) + +func (c *Client) newRequestWithContext(ctx context.Context, method, path string, body interface{}) (*http.Request, error) { + baseUrl, err := buildURL(*c.baseUrl, path) + if err != nil { + return nil, fmt.Errorf("error building URL: %v", err) + } + + setHeaders := func(r *http.Request) { + r.Header.Set("Content-Type", jsonMediaType) + r.Header.Set("Accept", jsonMediaType) + for k, v := range c.headers { + r.Header.Set(k, v) + } + } + + if method == http.MethodGet { + req, err := http.NewRequestWithContext(ctx, method, baseUrl.String(), nil) + if err != nil { + return nil, fmt.Errorf("error creating GET request: %v", err) + } + setHeaders(req) + return req, nil + } + + var bodyReader io.Reader + if body != nil { + bodyBytes, err := json.Marshal(body) + if err != nil { + return nil, fmt.Errorf("error marshaling body: %v", err) + } + bodyReader = bytes.NewReader(bodyBytes) + } + + req, err := http.NewRequestWithContext(ctx, method, baseUrl.String(), bodyReader) + if err != nil { + return nil, fmt.Errorf("error creating request: %v", err) + } + setHeaders(req) + return req, nil +} + +func buildURL(baseUrl url.URL, path string) (*url.URL, error) { + if !strings.HasSuffix(baseUrl.Path, "/") { + baseUrl.Path += "/" + } + baseUrl.Path += path + + newUrl, err := url.Parse(baseUrl.String()) + if err != nil { + return nil, fmt.Errorf("error building URL: %v", err) + } + return newUrl, nil +} diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go index 0f036a9..1071312 100644 --- a/pkg/errors/errors.go +++ b/pkg/errors/errors.go @@ -10,14 +10,30 @@ func (e *APIError) Error() string { return e.Message } -func NewAPIError(message string) *APIError { +func NewAPIError(message string) error { return &APIError{ Message: message, } } -func NewAPIErrorf(format string, a ...any) *APIError { +func NewAPIErrorf(format string, a ...any) error { return &APIError{ Message: fmt.Sprintf(format, a...), } } + +type Error struct { + HTTPCode int + Message string +} + +func (e *Error) Error() string { + return e.Message +} + +func NewError(httpCode int, message string) error { + return &Error{ + HTTPCode: httpCode, + Message: message, + } +} diff --git a/pkg/filemanager/filemanager.go b/pkg/filemanager/filemanager.go index 4745c0b..cdbb64b 100644 --- a/pkg/filemanager/filemanager.go +++ b/pkg/filemanager/filemanager.go @@ -7,7 +7,7 @@ import ( "path/filepath" ) -var ( +const ( writeFileMode = fs.FileMode(0777) ) @@ -48,3 +48,13 @@ func (f *FileManager) WriteConfigFile(name string, bytes []byte) error { func (f *FileManager) DeleteConfigFile(name string) error { return os.Remove(filepath.Join(f.configDir, name)) } + +func (f *FileManager) ConfigFileExists(name string) (bool, error) { + if _, err := os.Stat(filepath.Join(f.configDir, name)); err != nil { + if os.IsNotExist(err) { + return false, nil + } + return false, err + } + return true, nil +} diff --git a/pkg/galera/galera.go b/pkg/galera/galera.go index e6adcad..4a695bd 100644 --- a/pkg/galera/galera.go +++ b/pkg/galera/galera.go @@ -11,14 +11,17 @@ import ( guuid "github.com/google/uuid" ) -var ( +const ( GaleraStateFileName = "grastate.dat" BootstrapFileName = "1-bootstrap.cnf" BootstrapFile = `[galera] wsrep_new_cluster="ON"` RecoveryFileName = "2-recovery.cnf" RecoveryLogFileName = "mariadb.err" - RecoveryFile = fmt.Sprintf(`[galera] +) + +var ( + RecoveryFile = fmt.Sprintf(`[galera] log_error=%s wsrep_recover="ON"`, RecoveryLogFileName) ) diff --git a/pkg/handler/bootstrap/bootstrap.go b/pkg/handler/bootstrap/bootstrap.go index 9f6005d..88f27bd 100644 --- a/pkg/handler/bootstrap/bootstrap.go +++ b/pkg/handler/bootstrap/bootstrap.go @@ -83,14 +83,6 @@ func (b *Bootstrap) Put(w http.ResponseWriter, r *http.Request) { b.responseWriter.WriteErrorf(w, "error writing bootstrap config: %v", err) return } - - b.logger.Info("reloading mariadbd process") - if err := mariadbd.ReloadWithOptions(b.mariadbdReloadOptions); err != nil { - b.responseWriter.WriteErrorf(w, "error reloading mariadbd process: %v", err) - return - } - b.logger.Info("mariadbd process reloaded") - w.WriteHeader(http.StatusOK) } diff --git a/pkg/handler/handler.go b/pkg/handler/handler.go index 80ea881..716f9c6 100644 --- a/pkg/handler/handler.go +++ b/pkg/handler/handler.go @@ -24,12 +24,6 @@ type Options struct { type Option func(*Options) -func WithBootstrapOptions(opts ...bootstrap.Option) Option { - return func(o *Options) { - o.bootstrap = append(o.bootstrap, opts...) - } -} - func WithRecoveryOptions(opts ...recovery.Option) Option { return func(o *Options) { o.recovery = append(o.recovery, opts...) diff --git a/pkg/handler/recovery/recovery.go b/pkg/handler/recovery/recovery.go index dec9a2a..3416e3a 100644 --- a/pkg/handler/recovery/recovery.go +++ b/pkg/handler/recovery/recovery.go @@ -42,12 +42,6 @@ type Recovery struct { type Option func(*Recovery) -func WithMariadbdReload(opts *mariadbd.ReloadOptions) Option { - return func(b *Recovery) { - b.mariadbdReloadOptions = opts - } -} - func WithRecovery(opts *RecoveryOptions) Option { return func(r *Recovery) { r.recoveryOptions = opts @@ -73,7 +67,7 @@ func NewRecover(fileManager *filemanager.FileManager, responseWriter *responsewr func (r *Recovery) Put(w http.ResponseWriter, req *http.Request) { r.locker.Lock() defer r.locker.Unlock() - r.logger.V(1).Info("starting recovery") + r.logger.V(1).Info("enabling recovery") if err := r.fileManager.DeleteConfigFile(galera.BootstrapFileName); err != nil && !os.IsNotExist(err) { r.responseWriter.WriteErrorf(w, "error deleting existing bootstrap config: %v", err) @@ -89,30 +83,37 @@ func (r *Recovery) Put(w http.ResponseWriter, req *http.Request) { r.responseWriter.WriteErrorf(w, "error writing recovery config: %v", err) return } + w.WriteHeader(http.StatusOK) +} - r.logger.Info("reloading mariadbd process") - if err := mariadbd.ReloadWithOptions(r.mariadbdReloadOptions); err != nil { - r.logger.Error(err, "error reloading mariadbd process") - } else { - r.logger.Info("mariadbd process reloaded") - } +func (r *Recovery) Post(w http.ResponseWriter, req *http.Request) { + r.locker.Lock() + defer r.locker.Unlock() + r.logger.V(1).Info("starting recovery") - bootstrap, err := r.recover() + exists, err := r.fileManager.ConfigFileExists(galera.RecoveryFileName) if err != nil { - r.responseWriter.WriteErrorf(w, "error recovering galera: %v", err) + r.responseWriter.WriteErrorf(w, "error checking recovery config: %v", err) return } - - if err := r.fileManager.DeleteConfigFile(galera.RecoveryFileName); err != nil { - r.responseWriter.WriteErrorf(w, "error deleting recovery config: %v", err) + if !exists { + r.responseWriter.Write(w, errors.NewAPIError("recovery config not found"), http.StatusNotFound) return } - r.logger.V(1).Info("finished recovery") + bootstrap, err := r.recover() + if err != nil { + r.responseWriter.WriteErrorf(w, "error recovering galera: %v", err) + return + } r.responseWriter.WriteOK(w, bootstrap) } func (r *Recovery) Delete(w http.ResponseWriter, req *http.Request) { + r.locker.Lock() + defer r.locker.Unlock() + r.logger.V(1).Info("disabling recovery") + if err := r.fileManager.DeleteConfigFile(galera.RecoveryFileName); err != nil { if os.IsNotExist(err) { r.responseWriter.Write(w, errors.NewAPIError("recovery config not found"), http.StatusNotFound) diff --git a/pkg/mariadbd/mariadbd.go b/pkg/mariadbd/mariadbd.go index f6578c5..bc8bb2f 100644 --- a/pkg/mariadbd/mariadbd.go +++ b/pkg/mariadbd/mariadbd.go @@ -9,10 +9,13 @@ import ( "github.com/mitchellh/go-ps" ) -var ( +const ( mariadbdProcessName = "mariadbd" reloadSysCall = syscall.SIGKILL - errProcessNotFound = fmt.Errorf("process '%s' not found", mariadbdProcessName) +) + +var ( + errProcessNotFound = fmt.Errorf("process '%s' not found", mariadbdProcessName) ) func Reload() error { diff --git a/pkg/router/router.go b/pkg/router/router.go index b5fa4c3..f3b332d 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -64,6 +64,7 @@ func apiRouter(h *handler.Handler, opts *Options) http.Handler { r.Get("/galerastate", h.GaleraState.Get) r.Route("/recovery", func(r chi.Router) { r.Put("/", h.Recovery.Put) + r.Post("/", h.Recovery.Post) r.Delete("/", h.Recovery.Delete) })