Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Sai Bandi authored and vuil committed Jun 10, 2022
1 parent 7f3505b commit e37bae2
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tkg_integration_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ jobs:
fi
make configure-bom
make generate-embedproviders
E2E_CONFIG=$PWD/pkg/v1/tkg/test/config/aws.yaml hack/tools/bin/ginkgo -nodes=3 -v -trace -tags embedproviders pkg/v1/tkg/test/tkgctl/aws_cc
E2E_CONFIG=$PWD/pkg/v1/tkg/test/config/aws.yaml hack/tools/bin/ginkgo -nodes=3 -v -trace -tags embedproviders pkg/v1/tkg/test/tkgctl/aws_cc
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/config/clientconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -759,4 +759,4 @@ func GetCompatibilityFilePath() (string, error) {
return defaultCompatImagePath, fmt.Errorf("compatibility file is missing from CLI settings in the client configuration")
}
return cfg.ClientOptions.CLI.CompatibilityFilePath, nil
}
}
2 changes: 1 addition & 1 deletion pkg/v1/tkg/client/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,4 @@ func (c *TkgClient) ValidateManagementClusterVersionWithCLI(regionalClusterClien
}

return nil
}
}
2 changes: 1 addition & 1 deletion pkg/v1/tkg/client/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -740,4 +740,4 @@ func (c *TkgClient) safelyAddFeatureFlag(featureFlags map[string]string, feature
featureFlags = map[string]string{feature: value}
}
return featureFlags
}
}
28 changes: 28 additions & 0 deletions pkg/v1/tkg/test/cc_setup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Setup workload cluster on AWS using the ClusterClass mechanism

- Checkout `cc_aws_integ` branch of `https://github.com/vmware-tanzu/tanzu-framework.git` repo.
- Run `make build-install-cli-local`. This should build and install the Tanzu CLI on your machine.
- Update ~/.config/tanzu/tkg/bom/tkg-bom-v1.6.0-zshippable.yaml.

```text
tanzu-framework-management-packages:
- version: v0.21.0-dev-142-g9c114e97
images:
tanzuFrameworkManagementPackageRepositoryImage:
imagePath: management
imageRepository: gcr.io/eminent-nation-87317/tkg/test16
tag: v0.21.0
```

- Create a management-cluster on AWS. Currently we only validated the ClusterClass based workflows on AWS. `tanzu management-cluster create --ui`
- Set kubeconfig/kubeconfig to point to the newly created management cluster.
- Run this script - `pkg/v1/tkg/test/scripts/cc_hack.sh`.
- Your management-cluster is now ready for you to create a workload cluster using the cluster class mechanism. Create a workload cluster. `tanzu cluster create workload -f wc_config.yaml -v 6`
- Contents of the `wc_config.yaml` -

```text
AWS_REGION: us-east-1
AWS_SSH_KEY_NAME: <ssh key name setup on your AWS environement>
```

- You might hit an issue with workload cluster creation and it is a known issue - <https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/3399>
2 changes: 1 addition & 1 deletion pkg/v1/tkg/test/config/aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ tkg_config_variables:
AWS_SECRET_ACCESS_KEY: ""
AWS_SESSION_TOKEN: ""
management_cluster_options:
plan: dev
plan: dev
2 changes: 1 addition & 1 deletion pkg/v1/tkg/test/config/cc/aws/aws_cc_package_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ ENABLE_MHC_WORKER_NODE: true
ENABLE_MHC_CONTROL_PLANE: true
MHC_UNKNOWN_STATUS_TIMEOUT: 5m
MHC_FALSE_STATUS_TIMEOUT: 12m
NODE_STARTUP_TIMEOUT: 20m
NODE_STARTUP_TIMEOUT: 20m
3 changes: 2 additions & 1 deletion pkg/v1/tkg/test/tkgctl/aws_cc/aws_cc_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ package aws_cc
import (
"context"
"fmt"
"github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkg/test/framework/exec"
"os"
"path/filepath"
"strings"
"testing"
"time"

"github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkg/test/framework/exec"

. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
"github.com/onsi/ginkgo/reporters"
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/tkg/tkgctl/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,4 +364,4 @@ func logManagementCreationSuccess() {
log.Info(" tanzu cluster create [name] -f [file]\n\n")
log.Info("\nSome addons might be getting installed! Check their status by running the following:\n\n")
log.Info(" kubectl get apps -A\n\n")
}
}

0 comments on commit e37bae2

Please sign in to comment.