Skip to content

feat: Made ng labels env driven #6438

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.

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

Merged
merged 11 commits into from
Mar 21, 2025
2 changes: 1 addition & 1 deletion env_gen.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions env_gen.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
| Key | Type | Default Value | Description | Example | Deprecated |
|-------|----------|-------------------|-------------------|-----------------------|------------------|
| - | | | | | false |
| ADDITIONAL_NODE_GROUP_LABELS | | | Add comma separated list of additional node group labels to default labels | karpenter.sh/nodepool,cloud.google.com/gke-nodepool | false |
| APP_SYNC_IMAGE | string |quay.io/devtron/chart-sync:1227622d-132-3775 | | | false |
| APP_SYNC_JOB_RESOURCES_OBJ | string | | | | false |
| APP_SYNC_SERVICE_ACCOUNT | string |chart-sync | | | false |
Expand Down
44 changes: 29 additions & 15 deletions pkg/k8s/capacity/bean/bean.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ package bean
import (
"context"
"fmt"
"strings"
"time"

"github.com/caarlos0/env"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/kubernetes"
"strings"
"time"
)

const (
Expand All @@ -43,21 +45,33 @@ const NamespaceAll string = ""

// below const set is used for pod filters
const (
daemonSetFatal = "DaemonSet-managed Pods (use --ignore-daemonsets to ignore)"
daemonSetWarning = "ignoring DaemonSet-managed Pods"
localStorageFatal = "Pods with local storage (use --delete-emptydir-data to override)"
localStorageWarning = "deleting Pods with local storage"
unmanagedFatal = "Pods declare no controller (use --force to override)"
unmanagedWarning = "deleting Pods that declare no controller"
AWSNodeGroupLabel = "alpha.eksctl.io/nodegroup-name"
AzureNodeGroupLabel = "kubernetes.azure.com/agentpool"
GcpNodeGroupLabel = "cloud.google.com/gke-nodepool"
KopsNodeGroupLabel = "kops.k8s.io/instancegroup"
AWSEKSNodeGroupLabel = "eks.amazonaws.com/nodegroup"
daemonSetFatal = "DaemonSet-managed Pods (use --ignore-daemonsets to ignore)"
daemonSetWarning = "ignoring DaemonSet-managed Pods"
localStorageFatal = "Pods with local storage (use --delete-emptydir-data to override)"
localStorageWarning = "deleting Pods with local storage"
unmanagedFatal = "Pods declare no controller (use --force to override)"
unmanagedWarning = "deleting Pods that declare no controller"
AWSNodeGroupLabel = "alpha.eksctl.io/nodegroup-name"
AzureNodeGroupLabel = "kubernetes.azure.com/agentpool"
GcpNodeGroupLabel = "cloud.google.com/gke-nodepool"
KopsNodeGroupLabel = "kops.k8s.io/instancegroup"
AWSEKSNodeGroupLabel = "eks.amazonaws.com/nodegroup"
KarpenterNodeGroupLabel = "karpenter.sh/nodepool"
)

// TODO: add any new nodeGrouplabel in this array
var NodeGroupLabels = [5]string{AWSNodeGroupLabel, AzureNodeGroupLabel, GcpNodeGroupLabel, KopsNodeGroupLabel, AWSEKSNodeGroupLabel}
type NodeGroupConfig struct {
AdditionalLabels []string `env:"ADDITIONAL_NODE_GROUP_LABELS" envSeparator:"," description:"Add comma separated list of additional node group labels to default labels" example:"karpenter.sh/nodepool,cloud.google.com/gke-nodepool"`
}

var NodeGroupLabels = []string{AWSNodeGroupLabel, AzureNodeGroupLabel, GcpNodeGroupLabel, KopsNodeGroupLabel, AWSEKSNodeGroupLabel, KarpenterNodeGroupLabel}

func init() {
cfg := &NodeGroupConfig{}
if err := env.Parse(cfg); err == nil && len(cfg.AdditionalLabels) > 0 {
// Append additional labels from environment to default labels
NodeGroupLabels = append(NodeGroupLabels, cfg.AdditionalLabels...)
}
}

// below const set is used for pod delete status
const (
Expand Down
2 changes: 1 addition & 1 deletion wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.