From b8db02b150abeeec4c055aa2a1b90fcca815d7da Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Mon, 26 Dec 2022 06:03:36 +0300 Subject: [PATCH] :fire: Remove `kratos` and `keto` containers related code --- kubernetes/provider.go | 68 ++---------------------------------- resources/createResources.go | 8 ++--- 2 files changed, 4 insertions(+), 72 deletions(-) diff --git a/kubernetes/provider.go b/kubernetes/provider.go index d82427858..0a3b9fddb 100644 --- a/kubernetes/provider.go +++ b/kubernetes/provider.go @@ -178,8 +178,6 @@ type HubOptions struct { Namespace string PodName string PodImage string - KratosImage string - KetoImage string ServiceAccountName string IsNamespaceRestricted bool MaxEntriesDBSizeBytes int64 @@ -189,7 +187,7 @@ type HubOptions struct { Profiler bool } -func (provider *Provider) BuildHubPod(opts *HubOptions, mountVolumeClaim bool, volumeClaimName string, createAuthContainer bool) (*core.Pod, error) { +func (provider *Provider) BuildHubPod(opts *HubOptions, mountVolumeClaim bool, volumeClaimName string) (*core.Pod, error) { configMapVolume := &core.ConfigMapVolumeSource{} configMapVolume.Name = ConfigMapName @@ -278,68 +276,6 @@ func (provider *Provider) BuildHubPod(opts *HubOptions, mountVolumeClaim bool, v }, } - if createAuthContainer { - containers = append(containers, core.Container{ - Name: "kratos", - Image: opts.KratosImage, - ImagePullPolicy: opts.ImagePullPolicy, - VolumeMounts: volumeMounts, - ReadinessProbe: &core.Probe{ - FailureThreshold: 3, - ProbeHandler: core.ProbeHandler{ - HTTPGet: &core.HTTPGetAction{ - Path: "/health/ready", - Port: intstr.FromInt(4433), - Scheme: core.URISchemeHTTP, - }, - }, - PeriodSeconds: 1, - SuccessThreshold: 1, - TimeoutSeconds: 1, - }, - Resources: core.ResourceRequirements{ - Limits: core.ResourceList{ - "cpu": cpuLimit, - "memory": memLimit, - }, - Requests: core.ResourceList{ - "cpu": cpuRequests, - "memory": memRequests, - }, - }, - }) - - containers = append(containers, core.Container{ - Name: "keto", - Image: opts.KetoImage, - ImagePullPolicy: opts.ImagePullPolicy, - VolumeMounts: volumeMounts, - ReadinessProbe: &core.Probe{ - FailureThreshold: 3, - ProbeHandler: core.ProbeHandler{ - HTTPGet: &core.HTTPGetAction{ - Path: "/health/ready", - Port: intstr.FromInt(4466), - Scheme: core.URISchemeHTTP, - }, - }, - PeriodSeconds: 1, - SuccessThreshold: 1, - TimeoutSeconds: 1, - }, - Resources: core.ResourceRequirements{ - Limits: core.ResourceList{ - "cpu": cpuLimit, - "memory": memLimit, - }, - Requests: core.ResourceList{ - "cpu": cpuRequests, - "memory": memRequests, - }, - }, - }) - } - pod := &core.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: opts.PodName, @@ -374,7 +310,7 @@ func (provider *Provider) BuildHubPod(opts *HubOptions, mountVolumeClaim bool, v return pod, nil } -func (provider *Provider) BuildFrontPod(opts *HubOptions, mountVolumeClaim bool, volumeClaimName string, createAuthContainer bool) (*core.Pod, error) { +func (provider *Provider) BuildFrontPod(opts *HubOptions, mountVolumeClaim bool, volumeClaimName string) (*core.Pod, error) { configMapVolume := &core.ConfigMapVolumeSource{} configMapVolume.Name = ConfigMapName diff --git a/resources/createResources.go b/resources/createResources.go index 8221fc007..4fd23b30c 100644 --- a/resources/createResources.go +++ b/resources/createResources.go @@ -41,8 +41,6 @@ func CreateHubResources(ctx context.Context, kubernetesProvider *kubernetes.Prov Namespace: kubesharkResourcesNamespace, PodName: kubernetes.HubPodName, PodImage: docker.GetHubImage(), - KratosImage: "", - KetoImage: "", ServiceAccountName: serviceAccountName, IsNamespaceRestricted: isNsRestrictedMode, MaxEntriesDBSizeBytes: maxEntriesDBSizeBytes, @@ -56,8 +54,6 @@ func CreateHubResources(ctx context.Context, kubernetesProvider *kubernetes.Prov Namespace: kubesharkResourcesNamespace, PodName: kubernetes.FrontPodName, PodImage: docker.GetWorkerImage(), - KratosImage: "", - KetoImage: "", ServiceAccountName: serviceAccountName, IsNamespaceRestricted: isNsRestrictedMode, MaxEntriesDBSizeBytes: maxEntriesDBSizeBytes, @@ -117,7 +113,7 @@ func createRBACIfNecessary(ctx context.Context, kubernetesProvider *kubernetes.P } func createKubesharkHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, opts *kubernetes.HubOptions) error { - pod, err := kubernetesProvider.BuildHubPod(opts, false, "", false) + pod, err := kubernetesProvider.BuildHubPod(opts, false, "") if err != nil { return err } @@ -129,7 +125,7 @@ func createKubesharkHubPod(ctx context.Context, kubernetesProvider *kubernetes.P } func createFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, opts *kubernetes.HubOptions) error { - pod, err := kubernetesProvider.BuildFrontPod(opts, false, "", false) + pod, err := kubernetesProvider.BuildFrontPod(opts, false, "") if err != nil { return err }