Merge pull request #8633 from rifelpet/automated-cherry-pick-of-#8276…

…-origin-release-1.17

Automated cherry pick of #8276 and #8455: Add env API field to amazonvpc

docs/networking.md

@@ -405,6 +405,18 @@ $ kops create cluster \
 
 In case of any issues the directory `/var/log/aws-routed-eni` contains the log files of the CNI plugin. This directory is located in all the nodes in the cluster.
 
+[Configuration options for the Amazon VPC CNI plugin](https://github.com/aws/amazon-vpc-cni-k8s/tree/master#cni-configuration-variables) can be set through env vars defined in the cluster spec:
+
+```yaml
+  networking:
+    amazonvpc:
+      env:
+      - name: WARM_IP_TARGET
+        value: "10"
+      - name: AWS_VPC_K8S_CNI_LOGLEVEL
+        value: debug
+```
+
 ### Cilium Example for CNI and Network Policy
 
 Cilium is open source software for transparently securing the network connectivity between application services deployed using Linux container management platforms like Docker and Kubernetes.

k8s/crds/kops.k8s.io_clusters.yaml

@@ -2219,6 +2219,31 @@ spec:
                   description: AmazonVPCNetworkingSpec declares that we want Amazon
                     VPC CNI networking
                   properties:
+                    env:
+                      description: Env is a list of environment variables to set in
+                        the container.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: Name of the environment variable. Must be
+                              a C_IDENTIFIER.
+                            type: string
+                          value:
+                            description: 'Variable references $(VAR_NAME) are expanded
+                              using the previous defined environment variables in
+                              the container and any service environment variables.
+                              If a variable cannot be resolved, the reference in the
+                              input string will be unchanged. The $(VAR_NAME) syntax
+                              can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
+                              references will never be expanded, regardless of whether
+                              the variable exists or not. Defaults to "".'
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
                     imageName:
                       description: The container image name to use
                       type: string

pkg/apis/kops/cluster.go

@@ -634,6 +634,23 @@ func (c *Cluster) IsKubernetesGTE(version string) bool {
 	return clusterVersion.GTE(*parsedVersion)
 }
 
+// EnvVar represents an environment variable present in a Container.
+type EnvVar struct {
+	// Name of the environment variable. Must be a C_IDENTIFIER.
+	Name string `json:"name"`
+
+	// Variable references $(VAR_NAME) are expanded
+	// using the previous defined environment variables in the container and
+	// any service environment variables. If a variable cannot be resolved,
+	// the reference in the input string will be unchanged. The $(VAR_NAME)
+	// syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
+	// references will never be expanded, regardless of whether the variable
+	// exists or not.
+	// Defaults to "".
+	// +optional
+	Value string `json:"value,omitempty"`
+}
+
 type GossipConfig struct {
 	Protocol  *string       `json:"protocol,omitempty"`
 	Listen    *string       `json:"listen,omitempty"`

pkg/apis/kops/networking.go

@@ -166,6 +166,8 @@ type RomanaNetworkingSpec struct {
 type AmazonVPCNetworkingSpec struct {
 	// The container image name to use
 	ImageName string `json:"imageName,omitempty"`
+	// Env is a list of environment variables to set in the container.
+	Env []EnvVar `json:"env,omitempty"`
 }
 
 // CiliumNetworkingSpec declares that we want Cilium networking

pkg/apis/kops/v1alpha1/cluster.go

@@ -521,6 +521,23 @@ func (t *TerraformSpec) IsEmpty() bool {
 	return t.ProviderExtraConfig == nil
 }
 
+// EnvVar represents an environment variable present in a Container.
+type EnvVar struct {
+	// Name of the environment variable. Must be a C_IDENTIFIER.
+	Name string `json:"name"`
+
+	// Variable references $(VAR_NAME) are expanded
+	// using the previous defined environment variables in the container and
+	// any service environment variables. If a variable cannot be resolved,
+	// the reference in the input string will be unchanged. The $(VAR_NAME)
+	// syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
+	// references will never be expanded, regardless of whether the variable
+	// exists or not.
+	// Defaults to "".
+	// +optional
+	Value string `json:"value,omitempty"`
+}
+
 type GossipConfig struct {
 	Protocol  *string       `json:"protocol,omitempty"`
 	Listen    *string       `json:"listen,omitempty"`

pkg/apis/kops/v1alpha1/networking.go

@@ -166,6 +166,8 @@ type RomanaNetworkingSpec struct {
 type AmazonVPCNetworkingSpec struct {
 	// The container image name to use
 	ImageName string `json:"imageName,omitempty"`
+	// Env is a list of environment variables to set in the container.
+	Env []EnvVar `json:"env,omitempty"`
 }
 
 type CiliumNetworkingSpec struct {

pkg/apis/kops/v1alpha2/cluster.go

@@ -534,6 +534,23 @@ func (t *TerraformSpec) IsEmpty() bool {
 	return t.ProviderExtraConfig == nil
 }
 
+// EnvVar represents an environment variable present in a Container.
+type EnvVar struct {
+	// Name of the environment variable. Must be a C_IDENTIFIER.
+	Name string `json:"name"`
+
+	// Variable references $(VAR_NAME) are expanded
+	// using the previous defined environment variables in the container and
+	// any service environment variables. If a variable cannot be resolved,
+	// the reference in the input string will be unchanged. The $(VAR_NAME)
+	// syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
+	// references will never be expanded, regardless of whether the variable
+	// exists or not.
+	// Defaults to "".
+	// +optional
+	Value string `json:"value,omitempty"`
+}
+
 type GossipConfig struct {
 	Protocol  *string       `json:"protocol,omitempty"`
 	Listen    *string       `json:"listen,omitempty"`

pkg/apis/kops/v1alpha2/networking.go

@@ -166,6 +166,8 @@ type RomanaNetworkingSpec struct {
 type AmazonVPCNetworkingSpec struct {
 	// The container image name to use
 	ImageName string `json:"imageName,omitempty"`
+	// Env is a list of environment variables to set in the container.
+	Env []EnvVar `json:"env,omitempty"`
 }
 
 // CiliumNetworkingSpec declares that we want Cilium networking