Skip to content

Fix pdb #136

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix pdb #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b0719
fix: handle mutually exclusive PDB attributes
etrikp Feb 16, 2024
d154352
fix: use const for pdbTempSpec
etrikp Feb 16, 2024
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
45 changes: 27 additions & 18 deletions pkg/processor/poddisruptionbudget/pdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import (
"fmt"
"io"

"github.com/arttor/helmify/pkg/processor"

"github.com/arttor/helmify/pkg/helmify"
"github.com/arttor/helmify/pkg/processor"
yamlformat "github.com/arttor/helmify/pkg/yaml"
"github.com/iancoleman/strcase"
policyv1 "k8s.io/api/policy/v1"
Expand All @@ -20,8 +19,7 @@ import (
const (
pdbTempSpec = `
spec:
minAvailable: {{ .Values.%[1]s.minAvailable }}
maxUnavailable: {{ .Values.%[1]s.maxUnavailable }}
%[1]s
selector:
%[2]s
{{- include "%[3]s.selectorLabels" . | nindent 6 }}`
Expand All @@ -33,14 +31,12 @@ var pdbGVC = schema.GroupVersionKind{
Kind: "PodDisruptionBudget",
}

// New creates processor for k8s Service resource.
func New() helmify.Processor {
return &pdb{}
}

type pdb struct{}

// Process k8s Service object into template. Returns false if not capable of processing given resource type.
func (r pdb) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured) (bool, helmify.Template, error) {
if obj.GroupVersionKind() != pdbGVC {
return false, nil, nil
Expand All @@ -50,36 +46,49 @@ func (r pdb) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
if err != nil {
return true, nil, fmt.Errorf("%w: unable to cast to pdb", err)
}
spec := pdb.Spec
values := helmify.Values{}

// Extract the name and namespace for use in the error message
name := pdb.GetName()
namespace := pdb.GetNamespace()
if namespace == "" {
namespace = "default" // Assuming 'default' if no namespace is specified
}

// Check if both MinAvailable and MaxUnavailable are specified
if pdb.Spec.MinAvailable != nil && pdb.Spec.MaxUnavailable != nil {
return true, nil, fmt.Errorf("error in PodDisruptionBudget '%s' in namespace '%s': both MinAvailable and MaxUnavailable are specified, but only one is allowed", name, namespace)
}

meta, err := processor.ProcessObjMeta(appMeta, obj)
if err != nil {
return true, nil, err
}

name := appMeta.TrimName(obj.GetName())
nameCamel := strcase.ToLowerCamel(name)

selector, _ := yaml.Marshal(pdb.Spec.Selector)
selector = yamlformat.Indent(selector, 4)
selector = bytes.TrimRight(selector, "\n ")
selectorIndented := yamlformat.Indent(selector, 4)
selectorIndented = bytes.TrimRight(selectorIndented, "\n ")

values := helmify.Values{}
specSection := ""

if spec.MaxUnavailable != nil {
_, err := values.Add(spec.MaxUnavailable.IntValue(), nameCamel, "maxUnavailable")
if pdb.Spec.MaxUnavailable != nil {
specSection = "maxUnavailable: {{ .Values." + nameCamel + ".maxUnavailable }}"
_, err := values.Add(pdb.Spec.MaxUnavailable.IntValue(), nameCamel, "maxUnavailable")
if err != nil {
return true, nil, err
}
}

if spec.MinAvailable != nil {
_, err := values.Add(spec.MinAvailable.IntValue(), nameCamel, "minAvailable")
} else if pdb.Spec.MinAvailable != nil {
specSection = "minAvailable: {{ .Values." + nameCamel + ".minAvailable }}"
_, err := values.Add(pdb.Spec.MinAvailable.IntValue(), nameCamel, "minAvailable")
if err != nil {
return true, nil, err
}
}

res := meta + fmt.Sprintf(pdbTempSpec, nameCamel, selector, appMeta.ChartName())
res := meta + fmt.Sprintf(pdbTempSpec, specSection, selectorIndented, appMeta.ChartName())

return true, &result{
name: name,
data: res,
Expand Down