Revert "Revert "Revert "Revert "Upgrade kops to 1.22 (#708)""""

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 executors:
   default:
     docker:
-    - image: cimg/go:1.17.8
+    - image: cimg/go:1.17
 
 aliases:
 - &restore_cache
@@ -71,7 +71,7 @@ jobs:
 
   test-postgres:
     docker:
-    - image: cimg/go:1.17.8
+    - image: cimg/go:1.17
       environment:
         CLOUD_DATABASE=postgres://cloud_test@localhost:5432/cloud_test?sslmode=disable
     - image: circleci/postgres:11.2-alpine

Makefile

@@ -6,12 +6,12 @@
 ################################################################################
 
 ## Docker Build Versions
-DOCKER_BUILD_IMAGE = golang:1.17.4
-DOCKER_BASE_IMAGE = alpine:3.14
+DOCKER_BUILD_IMAGE = golang:1.17
+DOCKER_BASE_IMAGE = alpine:3.16
 
 ## Tool Versions
 TERRAFORM_VERSION=0.15.5
-KOPS_VERSION=v1.21.4
+KOPS_VERSION=v1.22.6
 HELM_VERSION=v3.5.3
 KUBECTL_VERSION=v1.21.2
 

README.md

@@ -29,7 +29,7 @@ The following is required to properly run the cloud server.
 1. Install [Go](https://golang.org/doc/install)
 2. Install [Terraform](https://learn.hashicorp.com/terraform/getting-started/install.html) version v0.15.5
    1. Try using [tfswitch](https://warrensbox.github.io/terraform-switcher/) for switching easily between versions
-3. Install [kops](https://github.com/kubernetes/kops/blob/master/docs/install.md) version 1.21.X
+3. Install [kops](https://github.com/kubernetes/kops/blob/master/docs/install.md) version 1.22.X
 4. Install [Helm](https://helm.sh/docs/intro/install/) version 3.5.X
 5. Install [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 6. Install [golang/mock](https://github.com/golang/mock#installation) version 1.4.x

build/Dockerfile

@@ -3,7 +3,7 @@
 
 # Build the mattermost cloud
 ARG DOCKER_BUILD_IMAGE=golang:1.17
-ARG DOCKER_BASE_IMAGE=alpine:3.14
+ARG DOCKER_BASE_IMAGE=alpine:3.16
 
 FROM ${DOCKER_BUILD_IMAGE} AS build
 WORKDIR /mattermost-cloud/

cmd/cloud/table_printer.go

@@ -126,10 +126,10 @@ var jsonRegexp = regexp.MustCompile(`^\{\.?([^{}]+)\}$|^\.?([^{}]+)$`)
 
 // relaxedJSONPathExpression attempts to be flexible with JSONPath expressions,
 // it accepts following formats:
-//	* {.ID}
-//	* {ID}
-//	* .ID
-//	* ID
+//   - {.ID}
+//   - {ID}
+//   - .ID
+//   - ID
 func relaxedJSONPathExpression(pathExpression string) (string, error) {
 	if len(pathExpression) == 0 {
 		return pathExpression, nil

internal/api/cluster.go

@@ -90,14 +90,15 @@ func handleGetClusters(c *Context, w http.ResponseWriter, r *http.Request) {
 // handleCreateCluster responds to POST /api/clusters, beginning the process of creating a new
 // cluster.
 // sample body:
-// {
-//		"provider": "aws",
-//		"version": "1.15.0",
-//		"kops-ami": "ami-xoxoxo",
-//		"size": "SizeAlef1000",
-//		"zones": "",
-//		"allow-installations": true
-// }
+//
+//	{
+//			"provider": "aws",
+//			"version": "1.15.0",
+//			"kops-ami": "ami-xoxoxo",
+//			"size": "SizeAlef1000",
+//			"zones": "",
+//			"allow-installations": true
+//	}
 func handleCreateCluster(c *Context, w http.ResponseWriter, r *http.Request) {
 	createClusterRequest, err := model.NewCreateClusterRequestFromReader(r.Body)
 	if err != nil {

internal/provisioner/kops_provisioner.go

@@ -132,8 +132,8 @@ type kopsCluster struct {
 
 // unmarshalKopsListClustersResponse unmarshals response from `kops get clusters -o json`.
 // Kops output from this command is not consistent, and it behaves in the following ways:
-//  * If there are multiple clusters an array of clusters is returned.
-//  * If there is only one cluster a single cluster object is returned (not as an array).
+//   - If there are multiple clusters an array of clusters is returned.
+//   - If there is only one cluster a single cluster object is returned (not as an array).
 func unmarshalKopsListClustersResponse(output string) ([]kopsCluster, error) {
 	trimmedOut := strings.TrimSpace(output)
 	if strings.HasPrefix(trimmedOut, "[") {

internal/provisioner/kops_provisioner_cluster.go

@@ -191,18 +191,6 @@ func (provisioner *KopsProvisioner) CreateCluster(cluster *model.Cluster, awsCli
 
 	logger.WithField("name", kopsMetadata.Name).Info("Successfully deployed kubernetes")
 
-	logger.WithField("name", kopsMetadata.Name).Info("Updating VolumeBindingMode in default storage class")
-	k8sClient, err := k8s.NewFromFile(kops.GetKubeConfigPath(), logger)
-	if err != nil {
-		return err
-	}
-
-	_, err = k8sClient.UpdateStorageClassVolumeBindingMode("gp2")
-	if err != nil {
-		return err
-	}
-	logger.WithField("name", kopsMetadata.Name).Info("Successfully updated storage class")
-
 	iamRole := fmt.Sprintf("nodes.%s", kopsMetadata.Name)
 	err = awsClient.AttachPolicyToRole(iamRole, aws.CustomNodePolicyName, logger)
 	if err != nil {
@@ -517,7 +505,7 @@ func (provisioner *KopsProvisioner) ProvisionCluster(cluster *model.Cluster, aws
 		if err != nil {
 			return err
 		}
-		// Pods for k8s-spot-termination-handler do not ment to be schedule in every cluster so doesn't need to fail provision in this case/
+		// Pods for k8s-spot-termination-handler do not mean to be schedule in every cluster so doesn't need to fail provision in this case
 		if len(pods.Items) == 0 && daemonSet != "k8s-spot-termination-handler" {
 			return fmt.Errorf("no pods found from %s/%s daemonSet", namespace, daemonSet)
 		}

internal/tools/aws/database_multitenant.go

@@ -604,9 +604,9 @@ func (d *RDSMultitenantDatabase) getAndLockAssignedMultitenantDatabase(store mod
 
 // This helper method finds a multitenant RDS cluster that is ready for receiving a database installation. The lookup
 // for multitenant databases will happen in order:
-//	1. fetch a multitenant database by installation ID.
-//	2. fetch all multitenant databases in the store which are under the max number of installations limit.
-//	3. fetch all multitenant databases in the RDS cluster that are under the max number of installations limit.
+//  1. fetch a multitenant database by installation ID.
+//  2. fetch all multitenant databases in the store which are under the max number of installations limit.
+//  3. fetch all multitenant databases in the RDS cluster that are under the max number of installations limit.
 func (d *RDSMultitenantDatabase) assignInstallationToMultitenantDatabaseAndLock(vpcID string, store model.InstallationDatabaseStoreInterface, logger log.FieldLogger) (*model.MultitenantDatabase, func(), error) {
 	multitenantDatabases, err := store.GetMultitenantDatabases(&model.MultitenantDatabaseFilter{
 		DatabaseType:          d.databaseType,

internal/tools/aws/database_multitenant_pgbouncer.go

@@ -163,9 +163,9 @@ func (d *RDSMultitenantPGBouncerDatabase) Provision(store model.InstallationData
 
 // This helper method finds a multitenant RDS cluster that is ready for receiving a database installation. The lookup
 // for multitenant databases will happen in order:
-//	1. fetch a multitenant database by installation ID.
-//	2. fetch all multitenant databases in the store which are under the max number of installations limit.
-//	3. fetch all multitenant databases in the RDS cluster that are under the max number of installations limit.
+//  1. fetch a multitenant database by installation ID.
+//  2. fetch all multitenant databases in the store which are under the max number of installations limit.
+//  3. fetch all multitenant databases in the RDS cluster that are under the max number of installations limit.
 func (d *RDSMultitenantPGBouncerDatabase) assignInstallationToProxiedDatabaseAndLock(vpcID string, store model.InstallationDatabaseStoreInterface, logger log.FieldLogger) (*model.DatabaseResourceGrouping, func(), error) {
 	multitenantDatabases, err := store.GetMultitenantDatabases(&model.MultitenantDatabaseFilter{
 		DatabaseType:          d.databaseType,

internal/tools/kops/cluster.go

@@ -79,11 +79,11 @@ func (c *Cmd) CreateCluster(name, cloud string, kopsRequest *model.KopsMetadataR
 // Example setValue: spec.kubernetesVersion=1.10.0
 func (c *Cmd) SetCluster(name, setValue string) error {
 	_, _, err := c.run(
-		"set",
+		"edit",
 		"cluster",
 		arg("name", name),
 		arg("state", "s3://", c.s3StateStore),
-		setValue,
+		arg("set", setValue),
 	)
 	if err != nil {
 		return errors.Wrap(err, "failed to invoke kops set cluster")

internal/tools/kops/instance_groups.go

@@ -220,12 +220,12 @@ func (c *Cmd) GetInstanceGroupYAML(clusterName, igName string) (string, error) {
 // SetInstanceGroup invokes kops set instancegroup, using the context of the created Cmd.
 func (c *Cmd) SetInstanceGroup(clusterName, instanceGroupName, setValue string) error {
 	_, _, err := c.run(
-		"set",
+		"edit",
 		"instancegroup",
 		arg("name", clusterName),
 		arg("state", "s3://", c.s3StateStore),
 		instanceGroupName,
-		setValue,
+		arg("set", setValue),
 	)
 	if err != nil {
 		return errors.Wrap(err, "failed to invoke kops set instancegroup")

model/env.go

@@ -49,8 +49,8 @@ func (em *EnvVarMap) Validate() error {
 
 // ClearOrPatch takes a new EnvVarMap and patches changes into the existing
 // EnvVarMap with the following logic:
-//  - If the new EnvVarMap is empty, clear the existing EnvVarMap completely.
-//  - If the new EnvVarMap is not empty, apply normal patch logic.
+//   - If the new EnvVarMap is empty, clear the existing EnvVarMap completely.
+//   - If the new EnvVarMap is not empty, apply normal patch logic.
 func (em *EnvVarMap) ClearOrPatch(new *EnvVarMap) bool {
 	if *em == nil {
 		if len(*new) == 0 {
@@ -73,10 +73,10 @@ func (em *EnvVarMap) ClearOrPatch(new *EnvVarMap) bool {
 
 // Patch takes a new EnvVarMap and patches changes into the existing EnvVarMap
 // with the following logic:
-//  - If the new EnvVar has the same key as an old EnvVar, update the value.
-//  - If the new EnvVar is a new key, add the EnvVar.
-//  - If the new EnvVar has no value(is blank), clear the old EnvVar if there
-//    was one.
+//   - If the new EnvVar has the same key as an old EnvVar, update the value.
+//   - If the new EnvVar is a new key, add the EnvVar.
+//   - If the new EnvVar has no value(is blank), clear the old EnvVar if there
+//     was one.
 func (em EnvVarMap) Patch(new EnvVarMap) bool {
 	if new == nil {
 		return false