github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-01 18:47:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Fix the issues in Helm chart such that helm template succeeds

Browse Source
This commit is contained in:
M. Mert Yildiran
2023-04-12 02:12:12 +03:00
parent d2b9bddf78
commit 18addbb980
8 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kubernetes/provider.go
View File

@@ -180,26 +180,26 @@ type PodOptions struct {
PodName string
PodImage string
ServiceAccountName string
Resources configStructs.Resources
Resources configStructs.ResourceRequirements
ImagePullPolicy core.PullPolicy
ImagePullSecrets []core.LocalObjectReference
Debug bool
}
func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
cpuLimit, err := resource.ParseQuantity(opts.Resources.CpuLimit)
cpuLimit, err := resource.ParseQuantity(opts.Resources.Limits.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu limit for %s pod", opts.PodName)
}
memLimit, err := resource.ParseQuantity(opts.Resources.MemoryLimit)
memLimit, err := resource.ParseQuantity(opts.Resources.Limits.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory limit for %s pod", opts.PodName)
}
cpuRequests, err := resource.ParseQuantity(opts.Resources.CpuRequests)
cpuRequests, err := resource.ParseQuantity(opts.Resources.Requests.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu request for %s pod", opts.PodName)
}
memRequests, err := resource.ParseQuantity(opts.Resources.MemoryRequests)
memRequests, err := resource.ParseQuantity(opts.Resources.Requests.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory request for %s pod", opts.PodName)
}
@@ -294,19 +294,19 @@ func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
}
func (provider *Provider) BuildFrontPod(opts *PodOptions, hubHost string, hubPort string) (*core.Pod, error) {
cpuLimit, err := resource.ParseQuantity(opts.Resources.CpuLimit)
cpuLimit, err := resource.ParseQuantity(opts.Resources.Limits.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu limit for %s pod", opts.PodName)
}
memLimit, err := resource.ParseQuantity(opts.Resources.MemoryLimit)
memLimit, err := resource.ParseQuantity(opts.Resources.Limits.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory limit for %s pod", opts.PodName)
}
cpuRequests, err := resource.ParseQuantity(opts.Resources.CpuRequests)
cpuRequests, err := resource.ParseQuantity(opts.Resources.Requests.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu request for %s pod", opts.PodName)
}
memRequests, err := resource.ParseQuantity(opts.Resources.MemoryRequests)
memRequests, err := resource.ParseQuantity(opts.Resources.Requests.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory request for %s pod", opts.PodName)
}
@@ -680,7 +680,7 @@ func (provider *Provider) BuildWorkerDaemonSet(
podImage string,
podName string,
serviceAccountName string,
resources configStructs.Resources,
resources configStructs.ResourceRequirements,
imagePullPolicy core.PullPolicy,
imagePullSecrets []core.LocalObjectReference,
serviceMesh bool,
@@ -688,19 +688,19 @@ func (provider *Provider) BuildWorkerDaemonSet(
debug bool,
) (*DaemonSet, error) {
// Resource limits
cpuLimit, err := resource.ParseQuantity(resources.CpuLimit)
cpuLimit, err := resource.ParseQuantity(resources.Limits.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu limit for %s pod", podName)
}
memLimit, err := resource.ParseQuantity(resources.MemoryLimit)
memLimit, err := resource.ParseQuantity(resources.Limits.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory limit for %s pod", podName)
}
cpuRequests, err := resource.ParseQuantity(resources.CpuRequests)
cpuRequests, err := resource.ParseQuantity(resources.Requests.CPU)
if err != nil {
return nil, fmt.Errorf("invalid cpu request for %s pod", podName)
}
memRequests, err := resource.ParseQuantity(resources.MemoryRequests)
memRequests, err := resource.ParseQuantity(resources.Requests.Memory)
if err != nil {
return nil, fmt.Errorf("invalid memory request for %s pod", podName)
}
@@ -897,7 +897,7 @@ func (provider *Provider) ApplyWorkerDaemonSet(
podImage string,
podName string,
serviceAccountName string,
resources configStructs.Resources,
resources configStructs.ResourceRequirements,
imagePullPolicy core.PullPolicy,
imagePullSecrets []core.LocalObjectReference,
serviceMesh bool,

2
kubernetes/workers.go
View File

@@ -14,7 +14,7 @@ func CreateWorkers(
selfServiceAccountExists bool,
ctx context.Context,
namespace string,
resources configStructs.Resources,
resources configStructs.ResourceRequirements,
imagePullPolicy core.PullPolicy,
imagePullSecrets []core.LocalObjectReference,
serviceMesh bool,