From bc6cf1a99ffbda33e1b1da2e11ef0f1b87d01327 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Tue, 17 Sep 2024 15:45:36 -0300 Subject: [PATCH 01/65] Bumped libs --- cmd/polaris/webhook.go | 2 - go.mod | 88 +++++++-------- go.sum | 240 +++++++++++++++++++---------------------- pkg/webhook/mutate.go | 2 +- pkg/webhook/webhook.go | 4 +- 5 files changed, 159 insertions(+), 177 deletions(-) diff --git a/cmd/polaris/webhook.go b/cmd/polaris/webhook.go index 167e46cdc..5e79417f5 100644 --- a/cmd/polaris/webhook.go +++ b/cmd/polaris/webhook.go @@ -50,8 +50,6 @@ var webhookCmd = &cobra.Command{ logrus.Debug("Setting up controller manager") mgr, err := manager.New(k8sConfig.GetConfigOrDie(), manager.Options{ - CertDir: certDir, - Port: webhookPort, WebhookServer: webhook.NewServer(webhook.Options{ CertDir: certDir, Port: webhookPort, diff --git a/go.mod b/go.mod index 86b73f48c..9854f7991 100644 --- a/go.mod +++ b/go.mod @@ -1,83 +1,83 @@ module github.com/fairwindsops/polaris -go 1.21 +go 1.22.6 require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/fairwindsops/controller-utils v0.3.4 - github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20230601204422-5c789e15990c - github.com/fatih/color v1.15.0 - github.com/gorilla/mux v1.8.0 + github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20240917173116-506f92bdf9a0 + github.com/fatih/color v1.17.0 + github.com/gorilla/mux v1.8.1 github.com/pkg/errors v0.9.1 github.com/qri-io/jsonschema v0.1.2 github.com/sirupsen/logrus v1.9.3 - github.com/spf13/cobra v1.8.0 - github.com/stretchr/testify v1.8.4 + github.com/spf13/cobra v1.8.1 + github.com/stretchr/testify v1.9.0 github.com/thoas/go-funk v0.9.3 - gomodules.xyz/jsonpatch/v2 v2.3.0 + gomodules.xyz/jsonpatch/v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.29.0 - k8s.io/apimachinery v0.29.0 - k8s.io/client-go v0.29.0 - sigs.k8s.io/controller-runtime v0.15.0 - sigs.k8s.io/yaml v1.3.0 + k8s.io/api v0.31.1 + k8s.io/apimachinery v0.31.1 + k8s.io/client-go v0.31.1 + sigs.k8s.io/controller-runtime v0.19.0 + sigs.k8s.io/yaml v1.4.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/go-restful/v3 v3.11.3 // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // 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 + github.com/go-openapi/jsonpointer v0.20.3 // indirect + github.com/go-openapi/jsonreference v0.20.5 // indirect + github.com/go-openapi/swag v0.22.10 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/imdario/mergo v0.3.13 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.15.1 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/qri-io/jsonpointer v0.1.1 // indirect github.com/samber/lo v1.46.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect + github.com/x448/float16 v0.8.4 // indirect + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/term v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - golang.org/x/time v0.3.0 // indirect - google.golang.org/appengine v1.6.8 // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.27.2 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 8c395e1f5..ca7b2780e 100644 --- a/go.sum +++ b/go.sum @@ -4,75 +4,72 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= 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/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= 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/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.11.3 h1:yagOQz/38xJmcNeZJtrUcKjkHRltIaIFXKWeG1SkWGE= +github.com/emicklei/go-restful/v3 v3.11.3/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fairwindsops/controller-utils v0.3.4 h1:t1qulL2GVDVUJTIE4icpBy3KnsxFTavnNAbFnd60blc= github.com/fairwindsops/controller-utils v0.3.4/go.mod h1:9/hOHX70/LG40RgtFAjtXFiMWEpItqm6Scf+obRFB2Y= -github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20230601204422-5c789e15990c h1:js6wazy/7V7cZI43affIa2FymWZ61rOp/H26HEE3ChY= -github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20230601204422-5c789e15990c/go.mod h1:bNIBr22uoqvgi3JzUg7Hg9QidCsvXWAhquNQRyDGJCo= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20240917173116-506f92bdf9a0 h1:7adPvardRgDkZlEfZJwNzfT25bZ9KY2odhmZeud19ds= +github.com/fairwindsops/insights-plugins/plugins/workloads v0.0.0-20240917173116-506f92bdf9a0/go.mod h1:J+1LlUXLrbYbCzk/oxe9NLTToUWtCRzfM3akvOV+VxM= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -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-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-openapi/jsonpointer v0.20.3 h1:jykzYWS/kyGtsHfRt6aV8JTB9pcQAXPIA7qlZ5aRlyk= +github.com/go-openapi/jsonpointer v0.20.3/go.mod h1:c7l0rjoouAuIxCm8v/JWKRgMjDG/+/7UBWsXMrv6PsM= +github.com/go-openapi/jsonreference v0.20.5 h1:hutI+cQI+HbSQaIGSfsBsYI0pHk+CATf8Fk5gCSj0yI= +github.com/go-openapi/jsonreference v0.20.5/go.mod h1:thAqAp31UABtI+FQGKAQfmv7DbFpKNUlva2UPCxKu2Y= +github.com/go-openapi/swag v0.22.10 h1:4y86NVn7Z2yYd6pfS4Z+Nyh3aAUL3Nul+LMbhFKy0gA= +github.com/go-openapi/swag v0.22.10/go.mod h1:Cnn8BYtRlx6BNE3DPN86f/xkapGIcLWzh3CLEb4C1jI= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -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/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= +github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -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 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -81,11 +78,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= 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.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= -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.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -95,10 +89,8 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -108,30 +100,32 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= 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_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/qri-io/jsonpointer v0.1.0/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH9v37ZaMV64= github.com/qri-io/jsonpointer v0.1.1 h1:prVZBZLL6TW5vsSB9fFHFAMBLI4b0ri5vribQlTJiBA= github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH9v37ZaMV64= github.com/qri-io/jsonschema v0.1.2 h1:JlI7JAlxBbxh5Y641ctf+3kxcwYM6QbKDiqiQRkIBr0= github.com/qri-io/jsonschema v0.1.2/go.mod h1:SiF7DGMMKfw3cPrKZErviQKaUGserd2PYMOGm0vrELU= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/qri-io/jsonschema v0.2.1 h1:NNFoKms+kut6ABPf6xiKNM5214jzxAhDBrPHCJ97Wg0= +github.com/qri-io/jsonschema v0.2.1/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= @@ -139,39 +133,36 @@ github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= 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/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/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= 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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -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.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -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.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +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.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= 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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= 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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -181,11 +172,10 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -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.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= 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= @@ -200,22 +190,21 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -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/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 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= @@ -227,17 +216,15 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= -gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -245,30 +232,27 @@ gopkg.in/yaml.v2 v2.2.8/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/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/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= -k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= -k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= -k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= -k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= -k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= -k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= -k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/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= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= +k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= +sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= 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.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/webhook/mutate.go b/pkg/webhook/mutate.go index a133eb253..6fa9764dc 100644 --- a/pkg/webhook/mutate.go +++ b/pkg/webhook/mutate.go @@ -33,7 +33,7 @@ import ( type Mutator struct { Client client.Client Config config.Configuration - decoder *admission.Decoder + decoder admission.Decoder } // NewMutateWebhook creates a mutating admission webhook for the apiType. diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index 4c343ecd3..f5c4587b1 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -36,7 +36,7 @@ import ( // Validator validates k8s resources. type Validator struct { Client client.Client - decoder *admission.Decoder + decoder admission.Decoder Config config.Configuration } @@ -56,7 +56,7 @@ func (v *Validator) handleInternal(req admission.Request) (*validator.Result, ku } // GetValidatedResults returns the validated results. -func GetValidatedResults(kind string, decoder *admission.Decoder, req admission.Request, config config.Configuration) (*validator.Result, kube.GenericResource, error) { +func GetValidatedResults(kind string, decoder admission.Decoder, req admission.Request, config config.Configuration) (*validator.Result, kube.GenericResource, error) { var resource kube.GenericResource var err error rawBytes := req.Object.Raw From d21da6815e6b9e2da4e24502ce2f86b153e79257 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Tue, 17 Sep 2024 15:47:43 -0300 Subject: [PATCH 02/65] Bumped libs --- go.mod | 2 +- go.sum | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9854f7991..23ba91a66 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/polaris -go 1.22.6 +go 1.23.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 diff --git a/go.sum b/go.sum index ca7b2780e..68e87a91e 100644 --- a/go.sum +++ b/go.sum @@ -122,8 +122,6 @@ github.com/qri-io/jsonpointer v0.1.1 h1:prVZBZLL6TW5vsSB9fFHFAMBLI4b0ri5vribQlTJ github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH9v37ZaMV64= github.com/qri-io/jsonschema v0.1.2 h1:JlI7JAlxBbxh5Y641ctf+3kxcwYM6QbKDiqiQRkIBr0= github.com/qri-io/jsonschema v0.1.2/go.mod h1:SiF7DGMMKfw3cPrKZErviQKaUGserd2PYMOGm0vrELU= -github.com/qri-io/jsonschema v0.2.1 h1:NNFoKms+kut6ABPf6xiKNM5214jzxAhDBrPHCJ97Wg0= -github.com/qri-io/jsonschema v0.2.1/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= From 28278f530e952191329510076d1725e9147a60e8 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:11:58 -0300 Subject: [PATCH 03/65] Fixed issues --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 23ba91a66..b7d3f4ffa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/polaris -go 1.23.0 +go 1.23 require ( github.com/AlecAivazis/survey/v2 v2.3.7 From bb9dc21c56c1d0c04f332c54bb53d67e58222b6f Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:13:25 -0300 Subject: [PATCH 04/65] Fixed issues --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index b7d3f4ffa..9d9f8a559 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/fairwindsops/polaris go 1.23 +toolchain go1.23.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 From 99d1f114d9d8539fa11d12e3ff0cd921bae60797 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:17:20 -0300 Subject: [PATCH 05/65] Fixed issues --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5a1bb122..015004e29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.20 LABEL org.opencontainers.image.authors="FairwindsOps, Inc." \ org.opencontainers.image.vendor="FairwindsOps, Inc." \ From ac8a333e0c3652435c3e167a28276694b8e90092 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:19:00 -0300 Subject: [PATCH 06/65] Fixed issues --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index 9d9f8a559..b7d3f4ffa 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,6 @@ module github.com/fairwindsops/polaris go 1.23 -toolchain go1.23.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 From a078afccfcd62a0af4a646c8d439ef1b887b17a9 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:21:28 -0300 Subject: [PATCH 07/65] Fixed issues --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b7d3f4ffa..3b583368c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/fairwindsops/polaris -go 1.23 +go 1.22.0 + +toolchain go1.22.1 require ( github.com/AlecAivazis/survey/v2 v2.3.7 From 3bca5fd03cf0b8d8d0823fde26073335c4db7f61 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:22:34 -0300 Subject: [PATCH 08/65] Fixed issues --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3b583368c..b4e612bcc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/polaris -go 1.22.0 +go 1.22 toolchain go1.22.1 From a312aec42579bcb2ceed069adaa8b673df9a42d8 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:23:16 -0300 Subject: [PATCH 09/65] Fixed issues --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index b4e612bcc..fc7097357 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/fairwindsops/polaris go 1.22 -toolchain go1.22.1 - require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/fairwindsops/controller-utils v0.3.4 From 6d1be687e54a48b069c5efdff730d8428db2fdd6 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:28:30 -0300 Subject: [PATCH 10/65] Fixing issue --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fc7097357..3b583368c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/fairwindsops/polaris -go 1.22 +go 1.22.0 + +toolchain go1.22.1 require ( github.com/AlecAivazis/survey/v2 v2.3.7 From 02050f018bb1d7e02d252fe3dceb04aee7979f35 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:31:47 -0300 Subject: [PATCH 11/65] Fixing issue --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7949d9b55..0a0a6e4ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: # The goreleaser image tag determins the version of Go. # Manually check goreleaser images for their version of Go. # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - - image: goreleaser/goreleaser:v1.18.2 + - image: goreleaser/goreleaser:v1.22.1 steps: - checkout - setup_remote_docker: From bcb7634ee8ddc507c070d4af2ff27bb7942c36d3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:34:33 -0300 Subject: [PATCH 12/65] Fixing issue --- .circleci/config.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a0a6e4ca..0dbb687a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,7 @@ jobs: test: docker: - - image: cimg/go:1.19 + - image: cimg/go:1.22 steps: - checkout - *set_environment_variables diff --git a/go.mod b/go.mod index 3b583368c..748b41620 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/polaris -go 1.22.0 +go 1.22.6 toolchain go1.22.1 From 5c1336dac0ba681b4507584be4a7847efee95cb2 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:47:48 -0300 Subject: [PATCH 13/65] Fixing issue --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0dbb687a7..6c06169bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,6 +129,8 @@ jobs: - *test_binary_dashboard build_and_push: + docker: + - image: cimg/go:1.22 working_directory: /go/src/github.com/fairwindsops/polaris/ resource_class: large shell: /bin/bash From c86de03d907422dcfe1566bc2aa543d4b0715fa2 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:49:19 -0300 Subject: [PATCH 14/65] Fixing issue --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c06169bf..3258c44d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,8 +129,6 @@ jobs: - *test_binary_dashboard build_and_push: - docker: - - image: cimg/go:1.22 working_directory: /go/src/github.com/fairwindsops/polaris/ resource_class: large shell: /bin/bash @@ -138,7 +136,7 @@ jobs: # The goreleaser image tag determins the version of Go. # Manually check goreleaser images for their version of Go. # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - - image: goreleaser/goreleaser:v1.22.1 + - image: goreleaser/goreleaser:v2.2.0 steps: - checkout - setup_remote_docker: From be0a1350127f8204274f9d3e4d5864ace6517093 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:50:39 -0300 Subject: [PATCH 15/65] Fixing issue --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3258c44d7..d26679264 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,7 +140,6 @@ jobs: steps: - checkout - setup_remote_docker: - version: 20.10.11 - *install_vault_alpine - rok8s/get_vault_env: vault_path: repo/global/env From e50081518de5f199fe0e6be9a64060218571e5cd Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:51:20 -0300 Subject: [PATCH 16/65] Fixing issue --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d26679264..287427607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,7 +139,7 @@ jobs: - image: goreleaser/goreleaser:v2.2.0 steps: - checkout - - setup_remote_docker: + - setup_remote_docker - *install_vault_alpine - rok8s/get_vault_env: vault_path: repo/global/env From 485eb7e178330b5ef29a3f3dafc78c1846bf6eb3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:53:59 -0300 Subject: [PATCH 17/65] Fixing issue --- .goreleaser.yml.envsubst | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index b45a4671e..97c7f92c9 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -1,3 +1,4 @@ +version: 2 checksum: name_template: 'checksums.txt' changelog: From 592bb17d161c3efe6a1f2a22be0f05ad1a18e6e3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:54:59 -0300 Subject: [PATCH 18/65] Fixing issue --- .goreleaser.yml.envsubst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 97c7f92c9..7de70c0ef 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -55,7 +55,7 @@ brews: tap: owner: FairwindsOps name: homebrew-tap - folder: Formula + directory: Formula description: Open Source Best Practices for Kubernetes test: | system "#{bin}/polaris version" From 0557d578489d96e88a310d1a0008201e82346338 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 09:56:59 -0300 Subject: [PATCH 19/65] Fixing issue --- .goreleaser.yml.envsubst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 7de70c0ef..78d878c9b 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -52,7 +52,7 @@ brews: - name: polaris # This is replaced using `envsubst`, depending on the git branch. skip_upload: ${skip_release} - tap: + repository: owner: FairwindsOps name: homebrew-tap directory: Formula From 42255d9ac18283323cfaf539842ff9de4fd160ad Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 10:13:52 -0300 Subject: [PATCH 20/65] Fixing issue --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index f94f3d906..0d03fb1b7 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser $@ +goreleaser --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 75b6d0544bf36f10980801df544345b2d4cc2fc9 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 10:16:14 -0300 Subject: [PATCH 21/65] Fixing issue --- pkg/webhook/webhook.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index f5c4587b1..950ac5958 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -36,16 +36,17 @@ import ( // Validator validates k8s resources. type Validator struct { Client client.Client - decoder admission.Decoder + decoder *admission.Decoder Config config.Configuration } // NewValidateWebhook creates a validating admission webhook for the apiType. func NewValidateWebhook(mgr manager.Manager, c config.Configuration) { path := "/validate" + decoder := admission.NewDecoder(runtime.NewScheme()) validator := Validator{ Client: mgr.GetClient(), - decoder: admission.NewDecoder(runtime.NewScheme()), + decoder: &decoder, Config: c, } mgr.GetWebhookServer().Register(path, &webhook.Admission{Handler: &validator}) @@ -56,7 +57,7 @@ func (v *Validator) handleInternal(req admission.Request) (*validator.Result, ku } // GetValidatedResults returns the validated results. -func GetValidatedResults(kind string, decoder admission.Decoder, req admission.Request, config config.Configuration) (*validator.Result, kube.GenericResource, error) { +func GetValidatedResults(kind string, decoder *admission.Decoder, req admission.Request, config config.Configuration) (*validator.Result, kube.GenericResource, error) { var resource kube.GenericResource var err error rawBytes := req.Object.Raw From 0b3d4ee4739762c5c0683b00aaae48f45e49fe3f Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 10:20:32 -0300 Subject: [PATCH 22/65] Fixing issue --- pkg/webhook/mutate.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/webhook/mutate.go b/pkg/webhook/mutate.go index 6fa9764dc..c4d10aa42 100644 --- a/pkg/webhook/mutate.go +++ b/pkg/webhook/mutate.go @@ -33,16 +33,16 @@ import ( type Mutator struct { Client client.Client Config config.Configuration - decoder admission.Decoder + decoder *admission.Decoder } // NewMutateWebhook creates a mutating admission webhook for the apiType. func NewMutateWebhook(mgr manager.Manager, c config.Configuration) { path := "/mutate" - + decoder := admission.NewDecoder(runtime.NewScheme()) mutator := Mutator{ Client: mgr.GetClient(), - decoder: admission.NewDecoder(runtime.NewScheme()), + decoder: &decoder, Config: c, } mgr.GetWebhookServer().Register(path, &webhook.Admission{Handler: &mutator}) From 1da061d20d91d451c9129eb9cba4e9c842a9ca00 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 10:42:20 -0300 Subject: [PATCH 23/65] Fixing issue --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 0d03fb1b7..09b96fbb1 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser --skip=sign $@ +goreleaser --snapshot --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 6da8c2d452bf7610701d7d95b4ef135a8da140ce Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 10:57:25 -0300 Subject: [PATCH 24/65] Fixing issue --- .goreleaser.yml.envsubst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 78d878c9b..20bd687c1 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,8 +50,7 @@ release: ``` brews: - name: polaris - # This is replaced using `envsubst`, depending on the git branch. - skip_upload: ${skip_release} + goarm: 6 repository: owner: FairwindsOps name: homebrew-tap From 096ca4dd4c3b9331b0e917a74d9cd4538f3e05d3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 11:13:58 -0300 Subject: [PATCH 25/65] Fixing issue --- .goreleaser.yml.envsubst | 1 - 1 file changed, 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 20bd687c1..0d2fc775c 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -40,7 +40,6 @@ signs: artifacts: checksum release: # This is replaced using `envsubst`, depending on the git branch. - disable: ${skip_release} prerelease: auto footer: | You can verify the signature of the checksums.txt file using [cosign](https://github.com/sigstore/cosign). From f983a12c8003863b12855b586127871e9122d6f2 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 11:35:40 -0300 Subject: [PATCH 26/65] Fixing issue --- .goreleaser.yml.envsubst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 0d2fc775c..de9d50a5a 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -49,6 +49,8 @@ release: ``` brews: - name: polaris + # This is replaced using `envsubst`, depending on the git branch. + skip_upload: ${skip_release} goarm: 6 repository: owner: FairwindsOps From b513e6520be3e85465bbfa348a743c52723cbaf3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 11:48:55 -0300 Subject: [PATCH 27/65] Fixing issue --- .goreleaser.yml.envsubst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index de9d50a5a..b2d589c1b 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -40,6 +40,7 @@ signs: artifacts: checksum release: # This is replaced using `envsubst`, depending on the git branch. + disable: false prerelease: auto footer: | You can verify the signature of the checksums.txt file using [cosign](https://github.com/sigstore/cosign). @@ -50,7 +51,7 @@ release: brews: - name: polaris # This is replaced using `envsubst`, depending on the git branch. - skip_upload: ${skip_release} + skip_upload: false goarm: 6 repository: owner: FairwindsOps @@ -83,31 +84,31 @@ docker_manifests: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Env.feature_docker_tag }} # This is replaced using `envsubst`, depending on the git branch. - skip_push: ${skip_feature_docker_tags} + skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:latest # This is replaced using `envsubst`, depending on the git branch. - skip_push: ${skip_release} + skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Tag }} # This is replaced using `envsubst`, depending on the git branch. - skip_push: ${skip_release} + skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }} # This is replaced using `envsubst`, depending on the git branch. - skip_push: ${skip_release} + skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }}.{{ .Minor }} # This is replaced using `envsubst`, depending on the git branch. - skip_push: ${skip_release} + skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" From 8ab76bfaecac06e00f4772c0e2245f2b55d81ce7 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 12:04:22 -0300 Subject: [PATCH 28/65] Fixing issue --- .goreleaser.yml.envsubst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index b2d589c1b..8f58d56ff 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -83,32 +83,22 @@ docker_manifests: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Env.feature_docker_tag }} - # This is replaced using `envsubst`, depending on the git branch. - skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:latest - # This is replaced using `envsubst`, depending on the git branch. - skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Tag }} - # This is replaced using `envsubst`, depending on the git branch. - skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }} - # This is replaced using `envsubst`, depending on the git branch. - skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }}.{{ .Minor }} - # This is replaced using `envsubst`, depending on the git branch. - skip_push: false image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" From 40631fd7689d51e27ec9c2f2f3e2008bac68399a Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 12:04:53 -0300 Subject: [PATCH 29/65] Fixing issue --- .goreleaser.yml.envsubst | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 8f58d56ff..90cfb5cc6 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,8 +50,6 @@ release: ``` brews: - name: polaris - # This is replaced using `envsubst`, depending on the git branch. - skip_upload: false goarm: 6 repository: owner: FairwindsOps From 1e7252a793f936874971dd2ed989039c9c32bb5b Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 12:05:26 -0300 Subject: [PATCH 30/65] Fixing issue --- .goreleaser.yml.envsubst | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 90cfb5cc6..ab24f5186 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -39,8 +39,6 @@ signs: args: ["sign-blob", "--key=hashivault://cosign", "-output-signature=${signature}", "${artifact}"] artifacts: checksum release: - # This is replaced using `envsubst`, depending on the git branch. - disable: false prerelease: auto footer: | You can verify the signature of the checksums.txt file using [cosign](https://github.com/sigstore/cosign). From 7983ad45331fa176aa36046dd503cfe82392a08b Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 12:22:36 -0300 Subject: [PATCH 31/65] Fixing issue --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 09b96fbb1..0d03fb1b7 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser --snapshot --skip=sign $@ +goreleaser --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 8d1a1c5522611e636913c39a050fbe98f11c47af Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 13:26:39 -0300 Subject: [PATCH 32/65] Fixing issues --- .goreleaser.yml.envsubst | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index ab24f5186..d79c0dce4 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -39,6 +39,8 @@ signs: args: ["sign-blob", "--key=hashivault://cosign", "-output-signature=${signature}", "${artifact}"] artifacts: checksum release: + # This is replaced using `envsubst`, depending on the git branch. + disable: ${skip_release} prerelease: auto footer: | You can verify the signature of the checksums.txt file using [cosign](https://github.com/sigstore/cosign). @@ -48,6 +50,8 @@ release: ``` brews: - name: polaris + # This is replaced using `envsubst`, depending on the git branch. + skip_upload: ${skip_release} goarm: 6 repository: owner: FairwindsOps @@ -79,22 +83,32 @@ docker_manifests: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Env.feature_docker_tag }} + # This is replaced using `envsubst`, depending on the git branch. + skip_push: ${skip_feature_docker_tags} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:latest + # This is replaced using `envsubst`, depending on the git branch. + skip_push: ${skip_release} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Tag }} + # This is replaced using `envsubst`, depending on the git branch. + skip_push: ${skip_release} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }} + # This is replaced using `envsubst`, depending on the git branch. + skip_push: ${skip_release} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - name_template: quay.io/fairwinds/polaris:{{ .Major }}.{{ .Minor }} + # This is replaced using `envsubst`, depending on the git branch. + skip_push: ${skip_release} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" + - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" \ No newline at end of file From 47f2b8c1636ef50d5c33c6edc581bb615cf8f105 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 13:27:28 -0300 Subject: [PATCH 33/65] Fixing issues --- .goreleaser.yml.envsubst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index d79c0dce4..9d1685cf6 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -39,7 +39,7 @@ signs: args: ["sign-blob", "--key=hashivault://cosign", "-output-signature=${signature}", "${artifact}"] artifacts: checksum release: - # This is replaced using `envsubst`, depending on the git branch. + # This is replaced using `envsubst`, depending on the git branch. disable: ${skip_release} prerelease: auto footer: | @@ -50,7 +50,7 @@ release: ``` brews: - name: polaris - # This is replaced using `envsubst`, depending on the git branch. + # This is replaced using `envsubst`, depending on the git branch. skip_upload: ${skip_release} goarm: 6 repository: From 6159d7725aee3d826cb96ec96226912e4133abc4 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 13:28:15 -0300 Subject: [PATCH 34/65] Fixing issues --- .goreleaser.yml.envsubst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 9d1685cf6..53ebd16b4 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,7 +50,7 @@ release: ``` brews: - name: polaris - # This is replaced using `envsubst`, depending on the git branch. + # This is replaced using `envsubst`, depending on the git branch. skip_upload: ${skip_release} goarm: 6 repository: From 14f0597c05b1eaad80bc7e518397334f6dd6ad5f Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 13:41:53 -0300 Subject: [PATCH 35/65] Fixing issues --- .goreleaser.yml.envsubst | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 53ebd16b4..1ecb03dc3 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,8 +50,6 @@ release: ``` brews: - name: polaris - # This is replaced using `envsubst`, depending on the git branch. - skip_upload: ${skip_release} goarm: 6 repository: owner: FairwindsOps From ddfc7e383d5ba8cf02826b838e14213289edf0d9 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:02:25 -0300 Subject: [PATCH 36/65] Trying to fix releaser --- .circleci/config.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 287427607..7ef517fc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,9 +146,12 @@ jobs: - rok8s/get_vault_env: vault_path: repo/polaris/env - *set_environment_variables - - run: docker login quay.io -u="${FAIRWINDS_QUAY_USER}" -p="${FAIRWINDS_QUAY_TOKEN}" - - install_goreleaser_dependencies - - run: scripts/goreleaser.sh + - rok8s/docker_login: + registry: "quay.io" + username: $FAIRWINDS_QUAY_USER + password-variable: FAIRWINDS_QUAY_TOKEN + - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV + - run: goreleaser workflows: version: 2 From 40dcb85160b995c2214d7a7a1d4ced34bdd055be Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:14:57 -0300 Subject: [PATCH 37/65] Trying to fix releaser --- .circleci/config.yml | 186 ++++++++++++------------------------------- 1 file changed, 50 insertions(+), 136 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ef517fc0..740a8e6cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,100 +4,8 @@ orbs: rok8s: fairwinds/rok8s-scripts@12 oss-docs: fairwinds/oss-docs@0 -executors: - vm: - machine: - enabled: true - -commands: - install_goreleaser_dependencies: - description: Installs dependencies for CI scripts - steps: - - run: apk update - # gettext provides envsubst - - run: apk add gettext - # Register other docker platforms, to build arm64. - # This shouldn't be needed, why TBD. - - run: docker run --privileged --rm tonistiigi/binfmt --install all - references: - set_environment_variables: &set_environment_variables - run: - name: Set Environment Variables - command: | - echo 'export CI_SHA1=$CIRCLE_SHA1' >> ${BASH_ENV} - echo 'export CI_BRANCH=$CIRCLE_BRANCH' >> ${BASH_ENV} - echo 'export CI_BUILD_NUM=$CIRCLE_BUILD_NUM' >> ${BASH_ENV} - echo 'export CI_TAG=$CIRCLE_TAG' >> ${BASH_ENV} - echo 'export PUSH_ALL_VERSION_TAGS=true' >> ${BASH_ENV} - echo 'export GOPROXY=https://proxy.golang.org' >> ${BASH_ENV} - echo 'export GO111MODULE=on' >> ${BASH_ENV} - echo 'export GOFLAGS=-mod=mod' >> ${BASH_ENV} - echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - - install_k8s: &install_k8s - run: - name: Install K8s - command: | - sudo apt-get update - echo "Installing git and jq" - sudo apt-get install -yqq jq git - - echo "Installing KIND" - curl -sLO https://github.com/kubernetes-sigs/kind/releases/download/v0.19.0/kind-linux-amd64 - chmod 0755 kind-linux-amd64 - sudo mv kind-linux-amd64 /usr/local/bin/kind - kind version - - echo "Installing Kubectl" - curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.25.10/bin/linux/amd64/kubectl - chmod 0755 kubectl - sudo mv kubectl /usr/local/bin/ - kubectl version --client - - - echo "Creating Kubernetes Cluster with Kind" - kind create cluster --wait=90s --image kindest/node:v1.25.9@sha256:c08d6c52820aa42e533b70bce0c2901183326d86dcdcbedecc9343681db45161 - docker ps -a - - kubectl version - - echo "Installing Helm" - curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 - chmod 700 get_helm.sh - ./get_helm.sh - - echo "Installing cert-manager" - helm repo add jetstack https://charts.jetstack.io - helm repo update - echo "Helm install" - helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.12.1 --set "installCRDs=true" --wait --create-namespace - echo "Install cert-manager successful" - - test_binary_dashboard: &test_binary_dashboard - run: - name: Test Dashboard - command: | - go run main.go dashboard --port 3000 --audit-path ./pkg/config/examples & - sleep 30 - curl -f http://localhost:3000 > /dev/null - curl -f http://localhost:3000/health > /dev/null - curl -f http://localhost:3000/favicon.ico > /dev/null - curl -f http://localhost:3000/static/css/main.css > /dev/null - curl -f http://localhost:3000/results.json > /dev/null - curl -f http://localhost:3000/details/security > /dev/null - test_k8s: &test_k8s - run: - name: Test Kubernetes Deployments - command: | - if [[ -z $CIRCLE_PR_NUMBER ]]; then - ./test/webhook_test.sh - ./test/kube_dashboard_test.sh - else - echo "Skipping Kubernetes tests for forked PR" - fi - - install_vault_alpine: &install_vault_alpine + install_vault: &install_vault run: name: install hashicorp vault command: | @@ -108,79 +16,85 @@ references: unzip vault_1.13.2_linux_amd64.zip mv vault /usr/bin/vault jobs: - test_k8s: - working_directory: ~/polaris - resource_class: medium - executor: vm + test: + docker: + - image: cimg/go:1.21 steps: - checkout - - *set_environment_variables - - *install_k8s - - *test_k8s - - test: + - run: + name: lint + command: | + echo "installing golint" + go install golang.org/x/lint/golint@latest + echo "linting..." + golint -set_exit_status ./... | tee golint-report.out + echo "checking go fmt..." + if ! test -z $(go fmt ./...); then + echo "Please run go fmt ./... to format your code" + exit 1 + fi + - run: + name: test + command: | + go test -v --bench --benchmem -coverprofile=coverage.txt -covermode=atomic ./pkg/... + go vet 2> govet-report.out + go tool cover -html=coverage.txt -o cover-report.html + snapshot: + working_directory: /go/src/github.com/fairwindsops/polaris + resource_class: large docker: - - image: cimg/go:1.22 + - image: goreleaser/goreleaser:v2.2.0 steps: - checkout - - *set_environment_variables - - run: go vet ./... - - run: go test ./... -coverprofile=coverage.txt -covermode=count - - *test_binary_dashboard - - build_and_push: - working_directory: /go/src/github.com/fairwindsops/polaris/ + - setup_remote_docker + - run: goreleaser --snapshot + - store_artifacts: + path: dist + destination: snapshot + release: + working_directory: /go/src/github.com/fairwindsops/polaris resource_class: large shell: /bin/bash docker: - # The goreleaser image tag determins the version of Go. - # Manually check goreleaser images for their version of Go. - # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - image: goreleaser/goreleaser:v2.2.0 steps: - checkout - setup_remote_docker - - *install_vault_alpine + - *install_vault - rok8s/get_vault_env: vault_path: repo/global/env - - rok8s/get_vault_env: - vault_path: repo/polaris/env - - *set_environment_variables - rok8s/docker_login: registry: "quay.io" username: $FAIRWINDS_QUAY_USER password-variable: FAIRWINDS_QUAY_TOKEN - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - run: goreleaser - workflows: version: 2 - - release: + test_and_build: jobs: - - test: - filters: - tags: - only: /.*/ - - build_and_push: - context: org-global - filters: - branches: - ignore: /pull\/[0-9]+/ - tags: - ignore: /^testing-.*/ - - test_k8s: + - test + - snapshot: requires: - - build_and_push + - test filters: branches: - ignore: /pull\/[0-9]+/ + only: /.*/ tags: - ignore: /^testing-.*/ + ignore: /.*/ + release: + jobs: - oss-docs/publish-docs: repository: polaris filters: branches: ignore: /.*/ tags: - ignore: /^testing-.*/ + only: /^.*/ + - release: + context: org-global + filters: + branches: + ignore: /.*/ + tags: + only: /.*/ From e43c2d6fd6f5c8652fe38e4e22d8e4afdb0ba631 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:16:57 -0300 Subject: [PATCH 38/65] Trying to fix releaser --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 740a8e6cb..683638ec5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: echo "checking go fmt..." if ! test -z $(go fmt ./...); then echo "Please run go fmt ./... to format your code" - exit 1 + #exit 1 fi - run: name: test From 02a78f56bb42975a4c953b0a1db9388edd35c423 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:17:56 -0300 Subject: [PATCH 39/65] Trying to fix releaser --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 683638ec5..03bc5bee1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,12 +27,6 @@ jobs: echo "installing golint" go install golang.org/x/lint/golint@latest echo "linting..." - golint -set_exit_status ./... | tee golint-report.out - echo "checking go fmt..." - if ! test -z $(go fmt ./...); then - echo "Please run go fmt ./... to format your code" - #exit 1 - fi - run: name: test command: | From 835b4292bcb02e3a771b9f9acf3024e6b4844e3a Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:32:36 -0300 Subject: [PATCH 40/65] Trying to fix releaser --- .circleci/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03bc5bee1..170a8e400 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,6 +63,16 @@ jobs: password-variable: FAIRWINDS_QUAY_TOKEN - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - run: goreleaser + test_k8s: &test_k8s + run: + name: Test Kubernetes Deployments + command: | + if [[ -z $CIRCLE_PR_NUMBER ]]; then + ./test/webhook_test.sh + ./test/kube_dashboard_test.sh + else + echo "Skipping Kubernetes tests for forked PR" + fi workflows: version: 2 test_and_build: From 13c3546c174baa1c1819ed63e7bd41e5bd264e5f Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:35:11 -0300 Subject: [PATCH 41/65] Trying to fix releaser --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 170a8e400..cb8b3dc79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,6 +86,9 @@ workflows: only: /.*/ tags: ignore: /.*/ + - test_k8s: + requires: + - snapshot release: jobs: - oss-docs/publish-docs: From ec9d6fa58d342cee57a0393840aad016abacaa7c Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:35:53 -0300 Subject: [PATCH 42/65] Trying to fix releaser --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb8b3dc79..3a8a9bf8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ jobs: password-variable: FAIRWINDS_QUAY_TOKEN - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - run: goreleaser - test_k8s: &test_k8s + test_k8s: run: name: Test Kubernetes Deployments command: | From 7b70f6b8599cb6bccbf565a34be757567651b256 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:38:24 -0300 Subject: [PATCH 43/65] Trying to fix releaser --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a8a9bf8e..9e8342523 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,9 @@ jobs: go test -v --bench --benchmem -coverprofile=coverage.txt -covermode=atomic ./pkg/... go vet 2> govet-report.out go tool cover -html=coverage.txt -o cover-report.html + - *set_environment_variables + - *install_k8s + - *test_k8s snapshot: working_directory: /go/src/github.com/fairwindsops/polaris resource_class: large From de9d7367cf0cbec31f396358d05639f52d142367 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:38:59 -0300 Subject: [PATCH 44/65] Trying to fix releaser --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e8342523..c5c2397a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,6 @@ jobs: go test -v --bench --benchmem -coverprofile=coverage.txt -covermode=atomic ./pkg/... go vet 2> govet-report.out go tool cover -html=coverage.txt -o cover-report.html - - *set_environment_variables - *install_k8s - *test_k8s snapshot: From e9fb921df56559bfe86e974c6960712915ce1574 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:40:00 -0300 Subject: [PATCH 45/65] Trying to fix releaser --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5c2397a4..ea7fc9cf3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,6 @@ jobs: go test -v --bench --benchmem -coverprofile=coverage.txt -covermode=atomic ./pkg/... go vet 2> govet-report.out go tool cover -html=coverage.txt -o cover-report.html - - *install_k8s - *test_k8s snapshot: working_directory: /go/src/github.com/fairwindsops/polaris From 8fc4aec01b71783b1b8dcc31c8921ec7245038d6 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:41:52 -0300 Subject: [PATCH 46/65] Trying to fix releaser --- .circleci/config.yml | 190 ++++++++++++++++++++++++++++++------------- 1 file changed, 134 insertions(+), 56 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea7fc9cf3..7ef517fc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,8 +4,100 @@ orbs: rok8s: fairwinds/rok8s-scripts@12 oss-docs: fairwinds/oss-docs@0 +executors: + vm: + machine: + enabled: true + +commands: + install_goreleaser_dependencies: + description: Installs dependencies for CI scripts + steps: + - run: apk update + # gettext provides envsubst + - run: apk add gettext + # Register other docker platforms, to build arm64. + # This shouldn't be needed, why TBD. + - run: docker run --privileged --rm tonistiigi/binfmt --install all + references: - install_vault: &install_vault + set_environment_variables: &set_environment_variables + run: + name: Set Environment Variables + command: | + echo 'export CI_SHA1=$CIRCLE_SHA1' >> ${BASH_ENV} + echo 'export CI_BRANCH=$CIRCLE_BRANCH' >> ${BASH_ENV} + echo 'export CI_BUILD_NUM=$CIRCLE_BUILD_NUM' >> ${BASH_ENV} + echo 'export CI_TAG=$CIRCLE_TAG' >> ${BASH_ENV} + echo 'export PUSH_ALL_VERSION_TAGS=true' >> ${BASH_ENV} + echo 'export GOPROXY=https://proxy.golang.org' >> ${BASH_ENV} + echo 'export GO111MODULE=on' >> ${BASH_ENV} + echo 'export GOFLAGS=-mod=mod' >> ${BASH_ENV} + echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV + + install_k8s: &install_k8s + run: + name: Install K8s + command: | + sudo apt-get update + echo "Installing git and jq" + sudo apt-get install -yqq jq git + + echo "Installing KIND" + curl -sLO https://github.com/kubernetes-sigs/kind/releases/download/v0.19.0/kind-linux-amd64 + chmod 0755 kind-linux-amd64 + sudo mv kind-linux-amd64 /usr/local/bin/kind + kind version + + echo "Installing Kubectl" + curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.25.10/bin/linux/amd64/kubectl + chmod 0755 kubectl + sudo mv kubectl /usr/local/bin/ + kubectl version --client + + + echo "Creating Kubernetes Cluster with Kind" + kind create cluster --wait=90s --image kindest/node:v1.25.9@sha256:c08d6c52820aa42e533b70bce0c2901183326d86dcdcbedecc9343681db45161 + docker ps -a + + kubectl version + + echo "Installing Helm" + curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 + chmod 700 get_helm.sh + ./get_helm.sh + + echo "Installing cert-manager" + helm repo add jetstack https://charts.jetstack.io + helm repo update + echo "Helm install" + helm install cert-manager jetstack/cert-manager --namespace cert-manager --version v1.12.1 --set "installCRDs=true" --wait --create-namespace + echo "Install cert-manager successful" + + test_binary_dashboard: &test_binary_dashboard + run: + name: Test Dashboard + command: | + go run main.go dashboard --port 3000 --audit-path ./pkg/config/examples & + sleep 30 + curl -f http://localhost:3000 > /dev/null + curl -f http://localhost:3000/health > /dev/null + curl -f http://localhost:3000/favicon.ico > /dev/null + curl -f http://localhost:3000/static/css/main.css > /dev/null + curl -f http://localhost:3000/results.json > /dev/null + curl -f http://localhost:3000/details/security > /dev/null + test_k8s: &test_k8s + run: + name: Test Kubernetes Deployments + command: | + if [[ -z $CIRCLE_PR_NUMBER ]]; then + ./test/webhook_test.sh + ./test/kube_dashboard_test.sh + else + echo "Skipping Kubernetes tests for forked PR" + fi + + install_vault_alpine: &install_vault_alpine run: name: install hashicorp vault command: | @@ -16,93 +108,79 @@ references: unzip vault_1.13.2_linux_amd64.zip mv vault /usr/bin/vault jobs: - test: - docker: - - image: cimg/go:1.21 + test_k8s: + working_directory: ~/polaris + resource_class: medium + executor: vm steps: - checkout - - run: - name: lint - command: | - echo "installing golint" - go install golang.org/x/lint/golint@latest - echo "linting..." - - run: - name: test - command: | - go test -v --bench --benchmem -coverprofile=coverage.txt -covermode=atomic ./pkg/... - go vet 2> govet-report.out - go tool cover -html=coverage.txt -o cover-report.html - - *test_k8s - snapshot: - working_directory: /go/src/github.com/fairwindsops/polaris - resource_class: large + - *set_environment_variables + - *install_k8s + - *test_k8s + + test: docker: - - image: goreleaser/goreleaser:v2.2.0 + - image: cimg/go:1.22 steps: - checkout - - setup_remote_docker - - run: goreleaser --snapshot - - store_artifacts: - path: dist - destination: snapshot - release: - working_directory: /go/src/github.com/fairwindsops/polaris + - *set_environment_variables + - run: go vet ./... + - run: go test ./... -coverprofile=coverage.txt -covermode=count + - *test_binary_dashboard + + build_and_push: + working_directory: /go/src/github.com/fairwindsops/polaris/ resource_class: large shell: /bin/bash docker: + # The goreleaser image tag determins the version of Go. + # Manually check goreleaser images for their version of Go. + # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - image: goreleaser/goreleaser:v2.2.0 steps: - checkout - setup_remote_docker - - *install_vault + - *install_vault_alpine - rok8s/get_vault_env: vault_path: repo/global/env + - rok8s/get_vault_env: + vault_path: repo/polaris/env + - *set_environment_variables - rok8s/docker_login: registry: "quay.io" username: $FAIRWINDS_QUAY_USER password-variable: FAIRWINDS_QUAY_TOKEN - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - run: goreleaser - test_k8s: - run: - name: Test Kubernetes Deployments - command: | - if [[ -z $CIRCLE_PR_NUMBER ]]; then - ./test/webhook_test.sh - ./test/kube_dashboard_test.sh - else - echo "Skipping Kubernetes tests for forked PR" - fi + workflows: version: 2 - test_and_build: + + release: jobs: - - test - - snapshot: - requires: - - test + - test: filters: - branches: + tags: only: /.*/ + - build_and_push: + context: org-global + filters: + branches: + ignore: /pull\/[0-9]+/ tags: - ignore: /.*/ + ignore: /^testing-.*/ - test_k8s: requires: - - snapshot - release: - jobs: - - oss-docs/publish-docs: - repository: polaris + - build_and_push filters: branches: - ignore: /.*/ + ignore: /pull\/[0-9]+/ tags: - only: /^.*/ - - release: - context: org-global + ignore: /^testing-.*/ + - oss-docs/publish-docs: + repository: polaris filters: branches: ignore: /.*/ tags: - only: /.*/ + ignore: /^testing-.*/ From b36c3143b65aaa0f0352248b537da2d5464bf939 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:43:58 -0300 Subject: [PATCH 47/65] Trying to fix releaser --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ef517fc0..287427607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,12 +146,9 @@ jobs: - rok8s/get_vault_env: vault_path: repo/polaris/env - *set_environment_variables - - rok8s/docker_login: - registry: "quay.io" - username: $FAIRWINDS_QUAY_USER - password-variable: FAIRWINDS_QUAY_TOKEN - - run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV - - run: goreleaser + - run: docker login quay.io -u="${FAIRWINDS_QUAY_USER}" -p="${FAIRWINDS_QUAY_TOKEN}" + - install_goreleaser_dependencies + - run: scripts/goreleaser.sh workflows: version: 2 From 4107f14ce247c41ab4606225cc4b5ce230411c43 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:54:42 -0300 Subject: [PATCH 48/65] Trying to fix releaser --- .goreleaser.yml.envsubst | 1 - scripts/goreleaser.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 1ecb03dc3..2cef1584e 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,7 +50,6 @@ release: ``` brews: - name: polaris - goarm: 6 repository: owner: FairwindsOps name: homebrew-tap diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 0d03fb1b7..4cbe3e0f9 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,6 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml +cat .goreleaser.yml goreleaser --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" From 5242e7dee0e3896975a93aa92028162280a78aa4 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:58:42 -0300 Subject: [PATCH 49/65] Trying to fix releaser --- .goreleaser.yml.envsubst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 2cef1584e..34d976ce2 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -50,6 +50,8 @@ release: ``` brews: - name: polaris + # This is replaced using `envsubst`, depending on the git branch. + skip_upload: ${skip_release} repository: owner: FairwindsOps name: homebrew-tap From b5b08f3df64fbfc7b2aa3c103eaa847060b316da Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 14:59:12 -0300 Subject: [PATCH 50/65] Trying to fix releaser --- .goreleaser.yml.envsubst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 34d976ce2..45e4845ea 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -51,7 +51,7 @@ release: brews: - name: polaris # This is replaced using `envsubst`, depending on the git branch. - skip_upload: ${skip_release} + skip_upload: ${skip_release} repository: owner: FairwindsOps name: homebrew-tap From 19a87e84babeea074b0bf8a317896b9ceb6f2990 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:15:33 -0300 Subject: [PATCH 51/65] Trying to fix releaser --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 4cbe3e0f9..5eb080001 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -56,7 +56,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml cat .goreleaser.yml -goreleaser --skip=sign $@ +goreleaser --snapshot --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 73bc0266ba7f1a452fa2e31f264fa9d71fb34655 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:20:19 -0300 Subject: [PATCH 52/65] Trying to fix releaser --- .circleci/config.yml | 2 +- .goreleaser.yml.envsubst | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 287427607..577763826 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: # The goreleaser image tag determins the version of Go. # Manually check goreleaser images for their version of Go. # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - - image: goreleaser/goreleaser:v2.2.0 + - image: goreleaser/goreleaser:v1.26 steps: - checkout - setup_remote_docker diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 45e4845ea..3876574c9 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -1,4 +1,3 @@ -version: 2 checksum: name_template: 'checksums.txt' changelog: @@ -52,10 +51,10 @@ brews: - name: polaris # This is replaced using `envsubst`, depending on the git branch. skip_upload: ${skip_release} - repository: + tap: owner: FairwindsOps name: homebrew-tap - directory: Formula + folder: Formula description: Open Source Best Practices for Kubernetes test: | system "#{bin}/polaris version" From e2f81e376267050f416aeb9440fb9e86683f1629 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:21:26 -0300 Subject: [PATCH 53/65] Trying to fix releaser --- .goreleaser.yml.envsubst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index 3876574c9..d9ac378eb 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -109,4 +109,5 @@ docker_manifests: skip_push: ${skip_release} image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" \ No newline at end of file + - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" + \ No newline at end of file From 94a971de0d49a90b3ebcb1a5348b6dc82c47ed38 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:22:16 -0300 Subject: [PATCH 54/65] Trying to fix releaser --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 5eb080001..fa5f23757 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -56,7 +56,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml cat .goreleaser.yml -goreleaser --snapshot --skip=sign $@ +goreleaser $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 2525c67a1c4d9ea3726404d53a6bb22a45427e3b Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:22:30 -0300 Subject: [PATCH 55/65] Trying to fix releaser --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index fa5f23757..35fc25b1b 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -cat .goreleaser.yml + goreleaser $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" From 2c4edf910d7617c0c3f1ef18b2467ee06cd77706 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:22:50 -0300 Subject: [PATCH 56/65] Trying to fix releaser --- scripts/goreleaser.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 35fc25b1b..f94f3d906 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,6 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml - goreleaser $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" From 0a79dd7c1e916e1ddbdf9903695534b0d96e8173 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:23:28 -0300 Subject: [PATCH 57/65] Trying to fix releaser --- .goreleaser.yml.envsubst | 1 - 1 file changed, 1 deletion(-) diff --git a/.goreleaser.yml.envsubst b/.goreleaser.yml.envsubst index d9ac378eb..b45a4671e 100644 --- a/.goreleaser.yml.envsubst +++ b/.goreleaser.yml.envsubst @@ -110,4 +110,3 @@ docker_manifests: image_templates: - "quay.io/fairwinds/polaris:{{ .FullCommit }}-amd64" - "quay.io/fairwinds/polaris:{{ .FullCommit }}-arm64" - \ No newline at end of file From 4bfd3b99fd294eb01e7e2a5d014e5fcc948ce2a3 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:25:05 -0300 Subject: [PATCH 58/65] Trying to fix releaser --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 577763826..f6d7d7f15 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: # The goreleaser image tag determins the version of Go. # Manually check goreleaser images for their version of Go. # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - - image: goreleaser/goreleaser:v1.26 + - image: goreleaser/goreleaser:v1.26.2 steps: - checkout - setup_remote_docker From 97741b17f901fd24c510348da9c552b0a394be02 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:26:40 -0300 Subject: [PATCH 59/65] Trying to fix --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 748b41620..967b0dadc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/polaris -go 1.22.6 +go 1.22.3 toolchain go1.22.1 From 56d50b303952e6e9aa44c02e51dd63cfea330705 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:27:02 -0300 Subject: [PATCH 60/65] Trying to fix --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 967b0dadc..369bbbe5d 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/fairwindsops/polaris go 1.22.3 -toolchain go1.22.1 - require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/fairwindsops/controller-utils v0.3.4 From dcf3ed7c77bf0d24a5dae282a914cf6372f8f97e Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:38:42 -0300 Subject: [PATCH 61/65] Trying to fix --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index f94f3d906..1556ebff8 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser $@ +goreleaser --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 536bbe52683a40fc88e615f9e0e16f2f3b61779e Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 15:54:17 -0300 Subject: [PATCH 62/65] Trying to fix --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 1556ebff8..09b96fbb1 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser --skip=sign $@ +goreleaser --snapshot --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 0ab2d650fa029493dd0c9469470431a3a4776085 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 16:04:59 -0300 Subject: [PATCH 63/65] Trying to fix --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 09b96fbb1..0d03fb1b7 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser --snapshot --skip=sign $@ +goreleaser --skip=sign $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs From 215df620df908edff7eba9de039b8a53011f7776 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 16:06:07 -0300 Subject: [PATCH 64/65] Trying to fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6d7d7f15..e7efea5a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: # The goreleaser image tag determins the version of Go. # Manually check goreleaser images for their version of Go. # Ref: https://hub.docker.com/r/goreleaser/goreleaser/tags - - image: goreleaser/goreleaser:v1.26.2 + - image: goreleaser/goreleaser:v1.20.0 steps: - checkout - setup_remote_docker From 408af27991016ecc52d1c065a609d21574f992d8 Mon Sep 17 00:00:00 2001 From: jdesouza Date: Wed, 18 Sep 2024 16:07:23 -0300 Subject: [PATCH 65/65] Trying to fix --- scripts/goreleaser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/goreleaser.sh b/scripts/goreleaser.sh index 0d03fb1b7..f94f3d906 100755 --- a/scripts/goreleaser.sh +++ b/scripts/goreleaser.sh @@ -55,7 +55,7 @@ echo "${this_script} using git tag ${GORELEASER_CURRENT_TAG}" # Only substitute specific variables, as goreleaser uses shell variable syntax # for its `signs` section `signature` and `artifact` variables. cat .goreleaser.yml.envsubst |envsubst '${skip_release} ${skip_feature_docker_tags} ${feature_docker_tag}' >.goreleaser.yml -goreleaser --skip=sign $@ +goreleaser $@ if [ $? -eq 0 ] ; then echo "${this_script} removing the temporary .goreleaser.yml since goreleaser was successful" rm .goreleaser.yml # Keep git clean for additional goreleaser runs