refactor: remove eks

loft-sh · Jul 23, 2024 · 599af4f · 599af4f
1 parent 1b6eea2
commit 599af4f
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 362 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -164,7 +164,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distribution: ["k3s", "k8s", "k0s", "eks"]
+        distribution: ["k3s", "k8s", "k0s"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -261,7 +261,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distribution: ["k3s", "k8s", "k0s", "eks"]
+        distribution: ["k3s", "k8s", "k0s"]
         test-suite-path: ${{fromJson(needs.get-testsuites-dir.outputs.matrix)}}
         multinamespace-mode: ["false", "true"]
         ha: ["false", "true"]
@@ -280,14 +280,10 @@ jobs:
             multinamespace-mode: "false"
         exclude:
           - ha: "true"
-          - distribution: "eks"
-            test-suite-path: "./test/e2e_scheduler"
           - distribution: "k8s"
             multinamespace-mode: "true"
           - distribution: "k0s"
             multinamespace-mode: "true"
-          - distribution: "eks"
-            multinamespace-mode: "true"
           - distribution: "k3s"
             multinamespace-mode: "true"
             test-suite-path: "./test/e2e_target_namespace"

diff --git a/chart/templates/_distro.tpl b/chart/templates/_distro.tpl
@@ -5,8 +5,6 @@
 {{ toYaml .Values.controlPlane.distro.k8s.env }}
 {{- else if and (eq (include "vcluster.distro" .) "k0s") .Values.controlPlane.distro.k0s.env -}}
 {{ toYaml .Values.controlPlane.distro.k0s.env }}
-{{- else if and (eq (include "vcluster.distro" .) "eks") .Values.controlPlane.distro.eks.env -}}
-{{ toYaml .Values.controlPlane.distro.eks.env }}
 {{- end -}}
 {{- end -}}
 
@@ -27,10 +25,6 @@ k0s
 k8s
 {{- $distros = add1 $distros -}}
 {{- end -}}
-{{- if .Values.controlPlane.distro.eks.enabled -}}
-eks
-{{- $distros = add1 $distros -}}
-{{- end -}}
 {{- if eq $distros 0 -}}
 k8s
 {{- else if gt $distros 1 -}}

diff --git a/chart/templates/_init-containers.tpl b/chart/templates/_init-containers.tpl
@@ -5,95 +5,9 @@
 {{ include "vcluster.k8s.initContainers" . }}
 {{- else if eq (include "vcluster.distro" .) "k0s" -}}
 {{ include "vcluster.k0s.initContainers" . }}
-{{- else if eq (include "vcluster.distro" .) "eks" -}}
-{{ include "vcluster.eks.initContainers" . }}
 {{- end -}}
 {{- end -}}
 
-{{- define "vcluster.eks.initContainers" -}}
-{{- include "vcluster.oldPlugins.initContainers" . }}
-{{- include "vcluster.plugins.initContainers" . }}
-# this is needed because the k8s containers are distroless and thus we don't have any
-# way of copying the binaries otherwise
-- name: vcluster-copy
-  image: {{ include "vcluster.controlPlane.image" . | quote }}
-  volumeMounts:
-    - mountPath: /binaries
-      name: binaries
-  command:
-    - /bin/sh
-  args:
-    - -c
-    - "cp /vcluster /binaries/vcluster"
-  {{- if .Values.controlPlane.statefulSet.imagePullPolicy }}
-  imagePullPolicy: {{ .Values.controlPlane.statefulSet.imagePullPolicy }}
-  {{- end }}
-  securityContext:
-{{ toYaml .Values.controlPlane.distro.eks.securityContext | indent 4 }}
-  resources:
-{{ toYaml .Values.controlPlane.distro.eks.resources | indent 4 }}
-{{- if .Values.controlPlane.distro.eks.controllerManager.enabled }}
-- name: kube-controller-manager
-  image: "{{ include "vcluster.image" (dict "defaultImageRegistry" .Values.controlPlane.advanced.defaultImageRegistry "registry" .Values.controlPlane.distro.eks.controllerManager.image.registry "repository" .Values.controlPlane.distro.eks.controllerManager.image.repository "tag" .Values.controlPlane.distro.eks.controllerManager.image.tag) }}"
-  volumeMounts:
-    - mountPath: /binaries
-      name: binaries
-  command:
-    - /binaries/vcluster
-  args:
-    - cp
-    - /usr/local/bin/kube-controller-manager
-    - /binaries/kube-controller-manager
-  {{- if .Values.controlPlane.distro.eks.controllerManager.imagePullPolicy }}
-  imagePullPolicy: {{ .Values.controlPlane.distro.eks.controllerManager.imagePullPolicy }}
-  {{- end }}
-  securityContext:
-{{ toYaml .Values.controlPlane.distro.eks.securityContext | indent 4 }}
-  resources:
-{{ toYaml .Values.controlPlane.distro.eks.resources | indent 4 }}
-{{- end }}
-{{- if .Values.controlPlane.advanced.virtualScheduler.enabled }}
-- name: kube-scheduler-manager
-  image: "{{ include "vcluster.image" (dict "defaultImageRegistry" .Values.controlPlane.advanced.defaultImageRegistry "registry" .Values.controlPlane.distro.eks.scheduler.image.registry "repository" .Values.controlPlane.distro.eks.scheduler.image.repository "tag" .Values.controlPlane.distro.eks.scheduler.image.tag) }}"
-  volumeMounts:
-    - mountPath: /binaries
-      name: binaries
-  command:
-    - /binaries/vcluster
-  args:
-    - cp
-    - /usr/local/bin/kube-scheduler
-    - /binaries/kube-scheduler
-  {{- if .Values.controlPlane.distro.eks.scheduler.imagePullPolicy }}
-  imagePullPolicy: {{ .Values.controlPlane.distro.eks.scheduler.imagePullPolicy }}
-  {{- end }}
-  securityContext:
-{{ toYaml .Values.controlPlane.distro.eks.securityContext | indent 4 }}
-  resources:
-{{ toYaml .Values.controlPlane.distro.eks.resources | indent 4 }}
-{{- end }}
-{{- if .Values.controlPlane.distro.eks.apiServer.enabled }}
-- name: kube-apiserver
-  image: "{{ include "vcluster.image" (dict "defaultImageRegistry" .Values.controlPlane.advanced.defaultImageRegistry "registry" .Values.controlPlane.distro.eks.apiServer.image.registry "repository" .Values.controlPlane.distro.eks.apiServer.image.repository "tag" .Values.controlPlane.distro.eks.apiServer.image.tag) }}"
-  volumeMounts:
-    - mountPath: /binaries
-      name: binaries
-  command:
-    - /binaries/vcluster
-  args:
-    - cp
-    - /usr/local/bin/kube-apiserver
-    - /binaries/kube-apiserver
-  {{- if .Values.controlPlane.distro.eks.apiServer.imagePullPolicy }}
-  imagePullPolicy: {{ .Values.controlPlane.distro.eks.apiServer.imagePullPolicy }}
-  {{- end }}
-  securityContext:
-{{ toYaml .Values.controlPlane.distro.eks.securityContext | indent 4 }}
-  resources:
-{{ toYaml .Values.controlPlane.distro.eks.resources | indent 4 }}
-{{- end }}
-{{- end -}}
-
 {{- define "vcluster.k8s.initContainers" -}}
 {{- include "vcluster.oldPlugins.initContainers" . }}
 {{- include "vcluster.plugins.initContainers" . }}

diff --git a/chart/tests/etcd-headless-service_test.yaml b/chart/tests/etcd-headless-service_test.yaml
@@ -66,7 +66,7 @@ tests:
           path: metadata.annotations.test
           value: test
 
-  - it: enable for eks & defaults
+  - it: enable for k8s & defaults
     release:
       name: my-release
       namespace: my-namespace
@@ -80,7 +80,7 @@ tests:
                 annotations:
                   test: test
         distro:
-          eks:
+          k8s:
             enabled: true
     asserts:
       - hasDocuments:

diff --git a/chart/tests/etcd-statefulset_test.yaml b/chart/tests/etcd-statefulset_test.yaml
@@ -159,7 +159,7 @@ tests:
                 annotations:
                   test: test
         distro:
-          eks:
+          k8s:
             enabled: true
     asserts:
       - hasDocuments:

diff --git a/chart/tests/statefulset_test.yaml b/chart/tests/statefulset_test.yaml
@@ -437,11 +437,11 @@ tests:
                 requests:
                   storage: 5Gi
 
-  - it: enable eks
+  - it: enable k8s
     set:
       controlPlane:
         distro:
-          eks:
+          k8s:
             enabled: true
     release:
       name: my-release
@@ -457,11 +457,11 @@ tests:
           path: spec.volumeClaimTemplates
           count: 1
 
-  - it: enable eks with deploy etcd
+  - it: enable k8s with deploy etcd
     set:
       controlPlane:
         distro:
-          eks:
+          k8s:
             enabled: true
         backingStore:
           etcd:

diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -741,10 +741,6 @@
         "k0s": {
           "$ref": "#/$defs/DistroK0s",
           "description": "K0S holds k0s relevant configuration."
-        },
-        "eks": {
-          "$ref": "#/$defs/DistroK8s",
-          "description": "EKS holds eks relevant configuration."
         }
       },
       "additionalProperties": false,

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -176,7 +176,7 @@ controlPlane:
           # Repository is the repository of the container image, e.g. my-repo/my-image
           repository: "kube-scheduler"
           # Tag is the tag of the container image, e.g. latest
-          tag: "v1.29.0"
+          tag: "v1.30.2"
       # Env are extra environment variables to use for the main container and NOT the init container.
       env: []
       # Security options can be used for the distro init container
@@ -249,75 +249,6 @@ controlPlane:
         requests:
           cpu: 40m
           memory: 64Mi
-    # EKS holds eks relevant configuration.
-    eks:
-      # Enabled specifies if the K8s distro should be enabled. Only one distro can be enabled at the same time.
-      enabled: false
-      # APIServer holds configuration specific to starting the api server.
-      apiServer:
-        enabled: true
-        # Command is the command to start the distro binary. This will override the existing command.
-        command: []
-        # ExtraArgs are additional arguments to pass to the distro binary.
-        extraArgs: []
-        # ImagePullPolicy is the pull policy for the distro image
-        imagePullPolicy: ""
-        # Image is the distro image
-        image:
-          # Registry is the registry of the container image, e.g. my-registry.com or ghcr.io. This setting can be globally
-          # overridden via the controlPlane.advanced.defaultImageRegistry option. Empty means docker hub.
-          registry: "public.ecr.aws"
-          # Repository is the repository of the container image, e.g. my-repo/my-image
-          repository: "eks-distro/kubernetes/kube-apiserver"
-          # Tag is the tag of the container image, e.g. latest
-          tag: "v1.28.2-eks-1-28-6"
-      # ControllerManager holds configuration specific to starting the controller manager.
-      controllerManager:
-        enabled: true
-        # Command is the command to start the distro binary. This will override the existing command.
-        command: []
-        # ExtraArgs are additional arguments to pass to the distro binary.
-        extraArgs: []
-        # ImagePullPolicy is the pull policy for the distro image
-        imagePullPolicy: ""
-        # Image is the distro image
-        image:
-          # Registry is the registry of the container image, e.g. my-registry.com or ghcr.io. This setting can be globally
-          # overridden via the controlPlane.advanced.defaultImageRegistry option. Empty means docker hub.
-          registry: "public.ecr.aws"
-          # Repository is the repository of the container image, e.g. my-repo/my-image
-          repository: "eks-distro/kubernetes/kube-controller-manager"
-          # Tag is the tag of the container image, e.g. latest
-          tag: "v1.28.2-eks-1-28-6"
-      # Scheduler holds configuration specific to starting the scheduler. Enable this via controlPlane.advanced.virtualScheduler.enabled
-      scheduler:
-        # Command is the command to start the distro binary. This will override the existing command.
-        command: []
-        # ExtraArgs are additional arguments to pass to the distro binary.
-        extraArgs: []
-        # ImagePullPolicy is the pull policy for the distro image
-        imagePullPolicy: ""
-        # Image is the distro image
-        image:
-          # Registry is the registry of the container image, e.g. my-registry.com or ghcr.io. This setting can be globally
-          # overridden via the controlPlane.advanced.defaultImageRegistry option. Empty means docker hub.
-          registry: "public.ecr.aws"
-          # Repository is the repository of the container image, e.g. my-repo/my-image
-          repository: "eks-distro/kubernetes/kube-scheduler"
-          # Tag is the tag of the container image, e.g. latest
-          tag: "v1.28.2-eks-1-28-6"
-      # Env are extra environment variables to use for the main container and NOT the init container.
-      env: []
-      # Security options can be used for the distro init container
-      securityContext: {}
-      # Resources for the distro init container
-      resources:
-        limits:
-          cpu: 100m
-          memory: 256Mi
-        requests:
-          cpu: 40m
-          memory: 64Mi
 
   # BackingStore defines which backing store to use for virtual cluster. If not defined will use embedded database as a default backing store.
   backingStore:

diff --git a/cmd/vclusterctl/cmd/convert/config.go b/cmd/vclusterctl/cmd/convert/config.go
@@ -47,7 +47,7 @@ cat /my/k0s/values.yaml | vcluster convert config --distro k0s
 		}}
 
 	cobraCmd.Flags().StringVarP(&c.filePath, "file", "f", "", "Path to the input file")
-	cobraCmd.Flags().StringVar(&c.distro, "distro", "", fmt.Sprintf("Kubernetes distro of the config. Allowed distros: %s", strings.Join([]string{"k8s", "k3s", "k0s", "eks"}, ", ")))
+	cobraCmd.Flags().StringVar(&c.distro, "distro", "", fmt.Sprintf("Kubernetes distro of the config. Allowed distros: %s", strings.Join([]string{"k8s", "k3s", "k0s"}, ", ")))
 	cobraCmd.Flags().StringVarP(&c.format, "output", "o", "yaml", "Prints the output in the specified format. Allowed values: yaml, json")
 
 	return cobraCmd

diff --git a/config/config.go b/config/config.go
@@ -216,8 +216,6 @@ func (c *Config) Distro() string {
 		return K0SDistro
 	} else if c.ControlPlane.Distro.K8S.Enabled {
 		return K8SDistro
-	} else if c.ControlPlane.Distro.EKS.Enabled {
-		return EKSDistro
 	}
 
 	return K8SDistro
@@ -259,7 +257,7 @@ func (c *Config) IsProFeatureEnabled() bool {
 		return true
 	}
 
-	if c.Distro() == K8SDistro || c.Distro() == EKSDistro {
+	if c.Distro() == K8SDistro {
 		if c.ControlPlane.BackingStore.Database.External.Enabled {
 			return true
 		}
@@ -754,9 +752,6 @@ type Distro struct {
 
 	// K0S holds k0s relevant configuration.
 	K0S DistroK0s `json:"k0s,omitempty"`
-
-	// EKS holds eks relevant configuration.
-	EKS DistroK8s `json:"eks,omitempty"`
 }
 
 type DistroK3s struct {