Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove in-template BeachHeadServices #502

Merged
merged 1 commit into from
Oct 17, 2024
+1 −97
Merged

remove in-template BeachHeadServices #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions templates/cluster/aws-standalone-cp/README.md
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions templates/cluster/aws-standalone-cp/templates/beachheadservices/cert-manager.yaml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions templates/cluster/aws-standalone-cp/templates/beachheadservices/nginx-ingress.yaml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions templates/cluster/aws-standalone-cp/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,4 @@ worker:

# K0s parameters
k0s:
version: v1.30.4+k0s.0

# Optionally install applications defined under
# templates/beachheadservices into target cluster
installBeachHeadServices: false
version: v1.30.4+k0s.0
1 change: 0 additions & 1 deletion test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ var _ = Describe("controller", Ordered, func() {
// Deploy standalone with an xlarge instance since it will also be
// hosting the hosted cluster.
GinkgoT().Setenv(managedcluster.EnvVarAWSInstanceType, "t3.xlarge")
GinkgoT().Setenv(managedcluster.EnvVarInstallBeachHeadServices, "false")

templateBy(managedcluster.TemplateAWSStandaloneCP, "creating a ManagedCluster")
sd := managedcluster.GetUnstructured(managedcluster.TemplateAWSStandaloneCP)
Expand Down
1 change: 0 additions & 1 deletion test/managedcluster/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const (
// Common
EnvVarManagedClusterName = "MANAGED_CLUSTER_NAME"
EnvVarHostedManagedClusterName = "HOSTED_MANAGED_CLUSTER_NAME"
EnvVarInstallBeachHeadServices = "INSTALL_BEACH_HEAD_SERVICES"
EnvVarControlPlaneNumber = "CONTROL_PLANE_NUMBER"
EnvVarWorkerNumber = "WORKER_NUMBER"
EnvVarNamespace = "NAMESPACE"
Expand Down
1 change: 0 additions & 1 deletion test/managedcluster/resources/aws-standalone-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ spec:
instanceType: ${AWS_INSTANCE_TYPE:=t3.small}
worker:
instanceType: ${AWS_INSTANCE_TYPE:=t3.small}
installBeachHeadServices: ${INSTALL_BEACH_HEAD_SERVICES:=true}