Remove changes from api/v1alpha1 and api/v1alpha2 and add changes to …

…manifest_staging directory Signed-off-by: Patrick von Steht <[email protected]>
eraser-dev · Feb 26, 2024 · 1056651 · 1056651
1 parent b7a87ef
commit 1056651
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 40 deletions.
diff --git a/api/v1alpha1/config/config.go b/api/v1alpha1/config/config.go
@@ -61,7 +61,6 @@ func Default() *v1alpha1.EraserConfig {
 					"eraser.sh/cleanup.filter",
 				},
 			},
-			AdditionalPodLabels: map[string]string{},
 		},
 		Components: v1alpha1.Components{
 			Collector: v1alpha1.OptionalContainerConfig{

diff --git a/api/v1alpha1/eraserconfig_types.go b/api/v1alpha1/eraserconfig_types.go
@@ -91,16 +91,15 @@ type ContainerConfig struct {
 }
 
 type ManagerConfig struct {
-	Runtime             Runtime           `json:"runtime,omitempty"`
-	OTLPEndpoint        string            `json:"otlpEndpoint,omitempty"`
-	LogLevel            string            `json:"logLevel,omitempty"`
-	Scheduling          ScheduleConfig    `json:"scheduling,omitempty"`
-	Profile             ProfileConfig     `json:"profile,omitempty"`
-	ImageJob            ImageJobConfig    `json:"imageJob,omitempty"`
-	PullSecrets         []string          `json:"pullSecrets,omitempty"`
-	NodeFilter          NodeFilterConfig  `json:"nodeFilter,omitempty"`
-	PriorityClassName   string            `json:"priorityClassName,omitempty"`
-	AdditionalPodLabels map[string]string `json:"additionalPodLabels,omitempty"`
+	Runtime           Runtime          `json:"runtime,omitempty"`
+	OTLPEndpoint      string           `json:"otlpEndpoint,omitempty"`
+	LogLevel          string           `json:"logLevel,omitempty"`
+	Scheduling        ScheduleConfig   `json:"scheduling,omitempty"`
+	Profile           ProfileConfig    `json:"profile,omitempty"`
+	ImageJob          ImageJobConfig   `json:"imageJob,omitempty"`
+	PullSecrets       []string         `json:"pullSecrets,omitempty"`
+	NodeFilter        NodeFilterConfig `json:"nodeFilter,omitempty"`
+	PriorityClassName string           `json:"priorityClassName,omitempty"`
 }
 
 type ScheduleConfig struct {

diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1alpha2/config/config.go b/api/v1alpha2/config/config.go
@@ -61,7 +61,6 @@ func Default() *v1alpha2.EraserConfig {
 					"eraser.sh/cleanup.filter",
 				},
 			},
-			AdditionalPodLabels: map[string]string{},
 		},
 		Components: v1alpha2.Components{
 			Collector: v1alpha2.OptionalContainerConfig{

diff --git a/api/v1alpha2/eraserconfig_types.go b/api/v1alpha2/eraserconfig_types.go
@@ -89,16 +89,15 @@ type ContainerConfig struct {
 }
 
 type ManagerConfig struct {
-	Runtime             Runtime           `json:"runtime,omitempty"`
-	OTLPEndpoint        string            `json:"otlpEndpoint,omitempty"`
-	LogLevel            string            `json:"logLevel,omitempty"`
-	Scheduling          ScheduleConfig    `json:"scheduling,omitempty"`
-	Profile             ProfileConfig     `json:"profile,omitempty"`
-	ImageJob            ImageJobConfig    `json:"imageJob,omitempty"`
-	PullSecrets         []string          `json:"pullSecrets,omitempty"`
-	NodeFilter          NodeFilterConfig  `json:"nodeFilter,omitempty"`
-	PriorityClassName   string            `json:"priorityClassName,omitempty"`
-	AdditionalPodLabels map[string]string `json:"additionalPodLabels,omitempty"`
+	Runtime           Runtime          `json:"runtime,omitempty"`
+	OTLPEndpoint      string           `json:"otlpEndpoint,omitempty"`
+	LogLevel          string           `json:"logLevel,omitempty"`
+	Scheduling        ScheduleConfig   `json:"scheduling,omitempty"`
+	Profile           ProfileConfig    `json:"profile,omitempty"`
+	ImageJob          ImageJobConfig   `json:"imageJob,omitempty"`
+	PullSecrets       []string         `json:"pullSecrets,omitempty"`
+	NodeFilter        NodeFilterConfig `json:"nodeFilter,omitempty"`
+	PriorityClassName string           `json:"priorityClassName,omitempty"`
 }
 
 type ScheduleConfig struct {

diff --git a/api/v1alpha2/zz_generated.conversion.go b/api/v1alpha2/zz_generated.conversion.go
diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/manifest_staging/charts/eraser/README.md b/manifest_staging/charts/eraser/README.md
@@ -45,6 +45,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen
 | runtimeConfig.manager.imageJob.cleanup          | Settings for image job cleanup.                                                                      | `{}`                           |
 | runtimeConfig.manager.pullSecrets               | Image pull secrets for collector/scanner/eraser.                                                     | `[]`                           |
 | runtimeConfig.manager.priorityClassName         | Priority class name for collector/scanner/eraser.                                                    | `""`                           |
+| runtimeConfig.manager.additionalPodLabels       | Additional labels for all pods that the controller creates at runtime.                               | `{}`                           |
 | runtimeConfig.manager.nodeFilter                | Filter for nodes.                                                                                    | `{}`                           |
 | runtimeConfig.components.collector              | Settings for the collector component.                                                                | `{ enabled: false }`           |
 | runtimeConfig.components.scanner                | Settings for the scanner component.                                                                  | `{ enabled: false }`           |
@@ -54,6 +55,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen
 | deploy.image.tag                                | Overrides the default image tag.                                                                     | `""`                           |
 | deploy.additionalArgs                           | Additional arguments to pass to the command.                                                         | `[]`                           |
 | deploy.priorityClassName                        | Priority class name.                                                                                 | `""`                           |
+| deploy.additionalPodLabels                      | Additional labels for the controller pod.                                                            | `{}`                           |
 | deploy.securityContext.allowPrivilegeEscalation | Whether to allow privilege escalation.                                                               | `false`                        |
 | deploy.resources.limits.memory                  | Memory limit for the resources.                                                                      | `30Mi`                         |
 | deploy.resources.requests.cpu                   | CPU request for the resources.                                                                       | `100m`                         |

diff --git a/manifest_staging/charts/eraser/templates/eraser-controller-manager-deployment.yaml b/manifest_staging/charts/eraser/templates/eraser-controller-manager-deployment.yaml
@@ -21,6 +21,7 @@ spec:
   template:
     metadata:
       labels:
+        {{- if .Values.deploy.additionalPodLabels }}{{- toYaml .Values.deploy.additionalPodLabels | nindent 8 }}{{end}}
         app.kubernetes.io/instance: '{{ .Release.Name }}'
         app.kubernetes.io/managed-by: '{{ .Release.Service }}'
         app.kubernetes.io/name: '{{ template "eraser.name" . }}'

diff --git a/manifest_staging/charts/eraser/values.yaml b/manifest_staging/charts/eraser/values.yaml
@@ -29,6 +29,7 @@ runtimeConfig:
         # delayOnFailure: ""
     pullSecrets: [] # image pull secrets for collector/scanner/eraser
     priorityClassName: "" # priority class name for collector/scanner/eraser
+    additionalPodLabels: {}
     nodeFilter:
       type: exclude # must be either exclude|include
       selectors:
@@ -97,6 +98,7 @@ deploy:
     tag: "v1.4.0-beta.0"
   additionalArgs: []
   priorityClassName: ""
+  additionalPodLabels: {}
 
   securityContext:
     allowPrivilegeEscalation: false

diff --git a/manifest_staging/deploy/eraser.yaml b/manifest_staging/deploy/eraser.yaml
@@ -432,6 +432,7 @@ data:
           delayOnFailure: 24h
       pullSecrets: [] # image pull secrets for collector/scanner/eraser
       priorityClassName: "" # priority class name for collector/scanner/eraser
+      additionalPodLabels: {}
       nodeFilter:
         type: exclude # must be either exclude|include
         selectors: