github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-07 19:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔥 Remove kratos and keto containers related code

Browse Source
This commit is contained in:
M. Mert Yildiran 2022-12-26 06:03:36 +03:00
parent 74e1eb558e
commit b8db02b150
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
2 changed files with 4 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
kubernetes/provider.go
View File

@ -178,8 +178,6 @@ type HubOptions struct {
Namespace string Namespace string
PodName string PodName string
PodImage string PodImage string
KratosImage string
KetoImage string
ServiceAccountName string ServiceAccountName string
IsNamespaceRestricted bool IsNamespaceRestricted bool
MaxEntriesDBSizeBytes int64 MaxEntriesDBSizeBytes int64
@ -189,7 +187,7 @@ type HubOptions struct {
Profiler bool 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 := &core.ConfigMapVolumeSource{}
configMapVolume.Name = ConfigMapName 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{ pod := &core.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: opts.PodName, Name: opts.PodName,
@ -374,7 +310,7 @@ func (provider *Provider) BuildHubPod(opts *HubOptions, mountVolumeClaim bool, v
return pod, nil 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 := &core.ConfigMapVolumeSource{}
configMapVolume.Name = ConfigMapName configMapVolume.Name = ConfigMapName

8
resources/createResources.go
View File

@ -41,8 +41,6 @@ func CreateHubResources(ctx context.Context, kubernetesProvider *kubernetes.Prov
Namespace: kubesharkResourcesNamespace, Namespace: kubesharkResourcesNamespace,
PodName: kubernetes.HubPodName, PodName: kubernetes.HubPodName,
PodImage: docker.GetHubImage(), PodImage: docker.GetHubImage(),
KratosImage: "",
KetoImage: "",
ServiceAccountName: serviceAccountName, ServiceAccountName: serviceAccountName,
IsNamespaceRestricted: isNsRestrictedMode, IsNamespaceRestricted: isNsRestrictedMode,
MaxEntriesDBSizeBytes: maxEntriesDBSizeBytes, MaxEntriesDBSizeBytes: maxEntriesDBSizeBytes,
@ -56,8 +54,6 @@ func CreateHubResources(ctx context.Context, kubernetesProvider *kubernetes.Prov
Namespace: kubesharkResourcesNamespace, Namespace: kubesharkResourcesNamespace,
PodName: kubernetes.FrontPodName, PodName: kubernetes.FrontPodName,
PodImage: docker.GetWorkerImage(), PodImage: docker.GetWorkerImage(),
KratosImage: "",
KetoImage: "",
ServiceAccountName: serviceAccountName, ServiceAccountName: serviceAccountName,
IsNamespaceRestricted: isNsRestrictedMode, IsNamespaceRestricted: isNsRestrictedMode,
MaxEntriesDBSizeBytes: maxEntriesDBSizeBytes, 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 { 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 { if err != nil {
return err 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 { 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 { if err != nil {
return err return err
} }