Skip to content

Commit

Permalink
Remove tanzu support (#8008)
Browse files Browse the repository at this point in the history
* Remove Tanzu support.

---------

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
  • Loading branch information
naemono committed Aug 19, 2024
1 parent c816995 commit e9c6a25
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 569 deletions.
4 changes: 0 additions & 4 deletions .buildkite/e2e/nightly-main-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,3 @@
- label: aks
fixed:
E2E_PROVIDER: aks

- label: tanzu
fixed:
E2E_PROVIDER: tanzu
2 changes: 1 addition & 1 deletion .buildkite/e2e/pipeline-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var (
pipelineTemplate string

// providersInDocker are k8s providers that require the deployer to run in Docker
providersInDocker = []string{"kind", "aks", "ocp", "tanzu"}
providersInDocker = []string{"kind", "aks", "ocp"}
// providersNoCleanup are k8s providers that do not require the cluster to be deleted after use
providersNoCleanup = []string{"kind"}
// providers are k8s providers for which it is not possible to retrieve the kube config after cluster creation
Expand Down
4 changes: 0 additions & 4 deletions .buildkite/e2e/release-branch-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,3 @@
- label: aks
fixed:
E2E_PROVIDER: aks

- label: tanzu
fixed:
E2E_PROVIDER: tanzu
13 changes: 0 additions & 13 deletions .buildkite/pipeline-e2e-clusters-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,3 @@ steps:
agents:
provider: "gcp"
image: "family/core-ubuntu-2004"

- label: ":broom: e2e test cluster cleanup tanzu"
# this does not depend on building deployer as the make target handles the building.
env:
E2E_PROVIDER: "tanzu"
# allows set-deployer-config.sh to set a sane default for cluster name in this operation.
CLUSTER_NAME: "none"
commands:
- .buildkite/scripts/test/set-deployer-config.sh
- make -C .buildkite TARGET="run-deployer-cleanup" ci
agents:
provider: "gcp"
image: "family/core-ubuntu-2004"
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,6 @@ switch-eks:
switch-kind:
@ echo "kind" > hack/deployer/config/provider

switch-tanzu:
@ echo "tanzu" > hack/deployer/config/provider

#################################
## -- Docker images -- ##
#################################
Expand Down
2 changes: 0 additions & 2 deletions hack/deployer/cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ func CreateCommand() *cobra.Command {
cfgData = fmt.Sprintf(runner.DefaultEKSRunConfigTemplate, user, vaultAddr, token)
case runner.KindDriverID:
cfgData = fmt.Sprintf(runner.DefaultKindRunConfigTemplate, user)
case runner.TanzuDriverID:
cfgData = fmt.Sprintf(runner.DefaultTanzuRunConfigTemplate, user)
default:
return fmt.Errorf("unknown provider %s", provider)
}
Expand Down
19 changes: 0 additions & 19 deletions hack/deployer/config/plans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,22 +170,3 @@ plans:
nodeCount: 3
nodeImage: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
ipFamily: ipv4
- id: tanzu-ci
operation: create
clusterName: tkg-ci
provider: tanzu
machineType: Standard_D8s_v3
diskSetup: kubectl apply -k hack/deployer/config/local-disks
tanzu:
location: eastus
nodeCount: 3
installerImage: cloudonk8s.azurecr.io/tanzu-ci:1.5.4
- id: tanzu-dev
operation: create
clusterName: tkg-dev
provider: tanzu
machineType: Standard_D8s_v3
tanzu:
location: westeurope
nodeCount: 3
installerImage: cloudonk8s.azurecr.io/tanzu-ci:1.5.4
24 changes: 8 additions & 16 deletions hack/deployer/runner/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ type Plan struct {
MachineType string `yaml:"machineType"`
// Abbreviations not all-caps to allow merging with mergo in `merge` as mergo does not understand struct tags and
// we use lowercase in the YAML
Gke *GKESettings `yaml:"gke,omitempty"`
Aks *AKSSettings `yaml:"aks,omitempty"`
Ocp *OCPSettings `yaml:"ocp,omitempty"`
Eks *EKSSettings `yaml:"eks,omitempty"`
Kind *KindSettings `yaml:"kind,omitempty"`
Tanzu *TanzuSettings `yaml:"tanzu,omitempty"`
ServiceAccount bool `yaml:"serviceAccount"`
EnforceSecurityPolicies bool `yaml:"enforceSecurityPolicies"`
DiskSetup string `yaml:"diskSetup"`
Gke *GKESettings `yaml:"gke,omitempty"`
Aks *AKSSettings `yaml:"aks,omitempty"`
Ocp *OCPSettings `yaml:"ocp,omitempty"`
Eks *EKSSettings `yaml:"eks,omitempty"`
Kind *KindSettings `yaml:"kind,omitempty"`
ServiceAccount bool `yaml:"serviceAccount"`
EnforceSecurityPolicies bool `yaml:"enforceSecurityPolicies"`
DiskSetup string `yaml:"diskSetup"`
}

// GKESettings encapsulates settings specific to GKE
Expand Down Expand Up @@ -87,13 +86,6 @@ type KindSettings struct {
IPFamily string `yaml:"ipFamily"`
}

type TanzuSettings struct {
AKSSettings `yaml:",inline"`
InstallerImage string `yaml:"installerImage"`
WorkDir string `yaml:"workDir"`
SSHPubKey string `yaml:"sshPubKey"`
}

// RunConfig encapsulates Id used to choose a plan and a map of overrides to apply to the plan, expected to map to a file
type RunConfig struct {
Id string `yaml:"id"` //nolint:revive
Expand Down
Loading

0 comments on commit e9c6a25

Please sign in to comment.