Merge pull request #115 from mjudeikis/mjudeikis/extra.args

Add extraArgs API for ad-hoc configurations

Author: kcp-ci-bot

config/crd/bases/operator.kcp.io_frontproxies.yaml

@@ -1524,6 +1524,12 @@ spec:
                   Optional: ExternalHostname under which the FrontProxy can be reached. If empty, the RootShard's external hostname will be used only.
                   Deprecated: use spec.External for configuration of external access instead.
                 type: string
+              extraArgs:
+                description: 'Optional: ExtraArgs defines additional command line
+                  arguments to pass to the front-proxy container.'
+                items:
+                  type: string
+                type: array
               image:
                 description: 'Optional: Image defines the image to use. Defaults to
                   the latest versioned image during the release of kcp-operator.'

config/crd/bases/operator.kcp.io_rootshards.yaml

@@ -1682,6 +1682,12 @@ spec:
                 - hostname
                 - port
                 type: object
+              extraArgs:
+                description: 'Optional: ExtraArgs defines additional command line
+                  arguments to pass to the shard container.'
+                items:
+                  type: string
+                type: array
               image:
                 description: ImageSpec defines settings for using a specific image
                   and overwriting the default images used.
@@ -3045,6 +3051,12 @@ spec:
                             type: object
                         type: object
                     type: object
+                  extraArgs:
+                    description: 'Optional: ExtraArgs defines additional command line
+                      arguments to pass to the front-proxy container.'
+                    items:
+                      type: string
+                    type: array
                   image:
                     description: 'Optional: Image allows to override the container
                       image used for this proxy.'

config/crd/bases/operator.kcp.io_shards.yaml

@@ -1595,6 +1595,12 @@ spec:
                 required:
                 - endpoints
                 type: object
+              extraArgs:
+                description: 'Optional: ExtraArgs defines additional command line
+                  arguments to pass to the shard container.'
+                items:
+                  type: string
+                type: array
               image:
                 description: ImageSpec defines settings for using a specific image
                   and overwriting the default images used.

internal/resources/frontproxy/deployment.go

@@ -246,6 +246,9 @@ func (r *reconciler) getArgs() []string {
 			args = append(args, fmt.Sprintf("--authentication-pass-on-groups=%q", strings.Join(auth.PassOnGroups, ",")))
 		}
 	}
+	if r.frontProxy.Spec.ExtraArgs != nil {
+		args = append(args, r.frontProxy.Spec.ExtraArgs...)
+	}
 
 	return args
 }

internal/resources/rootshard/deployment.go

@@ -192,6 +192,9 @@ func getArgs(rootShard *operatorv1alpha1.RootShard) []string {
 		"--enable-leader-election=true",
 		"--logging-format=json",
 	}
+	if rootShard.Spec.ExtraArgs != nil {
+		args = append(args, rootShard.Spec.ExtraArgs...)
+	}
 
 	return args
 }

internal/resources/shard/deployment.go

@@ -203,6 +203,9 @@ func getArgs(shard *operatorv1alpha1.Shard, rootShard *operatorv1alpha1.RootShar
 		"--enable-leader-election=true",
 		"--logging-format=json",
 	}
+	if shard.Spec.ExtraArgs != nil {
+		args = append(args, shard.Spec.ExtraArgs...)
+	}
 
 	return args
 }

sdk/apis/operator/v1alpha1/frontproxy_types.go

@@ -63,6 +63,9 @@ type FrontProxySpec struct {
 	// It will NOT be used to configure the API server's own TLS certificate or any other component.
 	// +optional
 	CABundleSecretRef *corev1.LocalObjectReference `json:"caBundleSecretRef,omitempty"`
+
+	// Optional: ExtraArgs defines additional command line arguments to pass to the front-proxy container.
+	ExtraArgs []string `json:"extraArgs,omitempty"`
 }
 
 type AuthSpec struct {

sdk/apis/operator/v1alpha1/rootshard_types.go

@@ -59,6 +59,9 @@ type RootShardProxySpec struct {
 	// CertificateTemplates allows to customize the properties on the generated
 	// certificates for this front-proxy.
 	CertificateTemplates CertificateTemplateMap `json:"certificateTemplates,omitempty"`
+
+	// Optional: ExtraArgs defines additional command line arguments to pass to the front-proxy container.
+	ExtraArgs []string `json:"extraArgs,omitempty"`
 }
 
 type ExternalConfig struct {

sdk/apis/operator/v1alpha1/shard_types.go

@@ -73,6 +73,9 @@ type CommonShardSpec struct {
 	// It will NOT be used to configure the API server's own TLS certificate or any other component.
 	// +optional
 	CABundleSecretRef *corev1.LocalObjectReference `json:"caBundleSecretRef,omitempty"`
+
+	// Optional: ExtraArgs defines additional command line arguments to pass to the shard container.
+	ExtraArgs []string `json:"extraArgs,omitempty"`
 }
 
 type AuditSpec struct {