Merge remote-tracking branch 'upstream/master' into MM-49359

cmd/cloud/cluster.go

@@ -664,10 +664,6 @@ func processUtilityFlags(utilityFlags utilityFlags) map[string]*model.HelmUtilit
 			Chart:      utilityFlags.rtcdVersion,
 			ValuesPath: utilityFlags.rtcdValues,
 		},
-		model.KubecostCanonicalName: {
-			Chart:      utilityFlags.kubecostVersion,
-			ValuesPath: utilityFlags.kubecostValues,
-		},
 		model.NodeProblemDetectorCanonicalName: {
 			Chart:      utilityFlags.nodeProblemDetectorVersion,
 			ValuesPath: utilityFlags.nodeProblemDetectorValues,

cmd/cloud/cluster_flag.go

@@ -72,8 +72,6 @@ type utilityFlags struct {
 	rtcdValues                 string
 	promtailVersion            string
 	promtailValues             string
-	kubecostVersion            string
-	kubecostValues             string
 	nodeProblemDetectorVersion string
 	nodeProblemDetectorValues  string
 	metricsServerVersion       string
@@ -103,8 +101,6 @@ func (flags *utilityFlags) addFlags(command *cobra.Command) {
 	command.Flags().StringVar(&flags.rtcdValues, "rtcd-values", "", "The full Git URL of the desired chart values for RTCD")
 	command.Flags().StringVar(&flags.promtailVersion, "promtail-version", "", "The version of Promtail to provision. Use 'stable' to provision the latest stable version published upstream.")
 	command.Flags().StringVar(&flags.promtailValues, "promtail-values", "", "The full Git URL of the desired chart values for Promtail")
-	command.Flags().StringVar(&flags.kubecostVersion, "kubecost-version", "", "The version of Kubecost. Use 'stable' to provision the latest stable version published upstream.")
-	command.Flags().StringVar(&flags.kubecostValues, "kubecost-values", "", "The full Git URL of the desired chart values for Kubecost")
 	command.Flags().StringVar(&flags.nodeProblemDetectorVersion, "node-problem-detector-version", "", "The version of Node Problem Detector. Use 'stable' to provision the latest stable version published upstream.")
 	command.Flags().StringVar(&flags.nodeProblemDetectorValues, "node-problem-detector-values", "", "The full Git URL of the desired chart values for Node Problem Detector")
 	command.Flags().StringVar(&flags.metricsServerVersion, "metrics-server-version", "", "The version of Metrics Server. Use 'stable' to provision the latest stable version published upstream.")

cmd/cloud/server.go

@@ -128,10 +128,6 @@ func executeServerCmd(flags serverFlags) error {
 	}
 	model.SetUtilityDefaults(flags.utilitiesGitURL)
 
-	if flags.kubecostToken != "" {
-		_ = os.Setenv(model.KubecostToken, flags.kubecostToken)
-	}
-
 	logger := logger.WithField("instance", instanceID)
 
 	sqlStore, err := sqlStore(flags.database)

cmd/cloud/server_flag.go

@@ -194,7 +194,6 @@ type serverFlags struct {
 	database      string
 	maxSchemas    int64
 	enableRoute53 bool
-	kubecostToken string
 
 	poll     int
 	slowPoll int
@@ -221,7 +220,6 @@ func (flags *serverFlags) addFlags(command *cobra.Command) {
 	command.Flags().StringVar(&flags.database, "database", "sqlite://cloud.db", "The database backing the provisioning server.")
 	command.Flags().Int64Var(&flags.maxSchemas, "default-max-schemas-per-logical-database", 10, "When importing and creating new proxy multitenant databases, this value is used for MaxInstallationsPerLogicalDatabase.")
 	command.Flags().BoolVar(&flags.enableRoute53, "installation-enable-route53", false, "Specifies whether CNAME records for Installation should be created in Route53 as well.")
-	command.Flags().StringVar(&flags.kubecostToken, "kubecost-token", "", "Set a kubecost token")
 
 	command.Flags().IntVar(&flags.poll, "poll", 30, "The interval in seconds to poll for background work.")
 	command.Flags().IntVar(&flags.slowPoll, "slow-poll", 60, "The interval in seconds to poll for background work for supervisors that are not time sensitive (slow-poll supervisors).")

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.13.26
 	github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.16.10
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/cenkalti/backoff/v4 v4.1.0
 	github.com/cloudflare/cloudflare-go v0.54.0
@@ -40,6 +41,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/slok/sloth v0.10.0
 	github.com/spf13/cobra v1.6.1
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.1
 	github.com/vrischmann/envconfig v1.3.0
@@ -121,7 +123,6 @@ require (
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect

go.sum

@@ -256,6 +256,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT
 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4=
 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1/go.mod h1:XLAGFrEjbvMCLvAtWLLP32yTv8GpBquCApZEycDLunI=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.16.10 h1:6obimjQAiRlEUZT7a2Q1ikH7ck4cPO3phGz4wqI5f2w=
+github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.16.10/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE=
 github.com/aws/aws-sdk-go-v2/service/sso v1.3.1/go.mod h1:J3A3RGUvuCZjvSuZEcOpHDnzZP/sKbhDWV2T1EOzFIM=

internal/api/request_test.go

@@ -36,7 +36,6 @@ func TestNewCreateClusterRequestFromReader(t *testing.T) {
 				"pgbouncer":             {Chart: "1.2.0", ValuesPath: ""},
 				"promtail":              {Chart: "6.2.2", ValuesPath: ""},
 				"rtcd":                  {Chart: "1.1.0", ValuesPath: ""},
-				"kubecost":              {Chart: "1.95.0", ValuesPath: ""},
 				"node-problem-detector": {Chart: "2.0.5", ValuesPath: ""},
 				"metrics-server":        {Chart: "3.8.2", ValuesPath: ""},
 				"velero":                {Chart: "2.31.3", ValuesPath: ""},
@@ -106,7 +105,6 @@ func TestNewCreateClusterRequestFromReader(t *testing.T) {
 				"pgbouncer":             {Chart: "1.2.0", ValuesPath: ""},
 				"promtail":              {Chart: "6.2.2", ValuesPath: ""},
 				"rtcd":                  {Chart: "1.1.0", ValuesPath: ""},
-				"kubecost":              {Chart: "1.95.0", ValuesPath: ""},
 				"node-problem-detector": {Chart: "2.0.5", ValuesPath: ""},
 				"metrics-server":        {Chart: "3.8.2", ValuesPath: ""},
 				"velero":                {Chart: "2.31.3", ValuesPath: ""},