kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comment-out hardcoded default values and add the overriden ones as template functions for ease of customization 

Update auto-generated files
This commit is contained in:
Moshe Shitrit 2021-06-19 13:17:19 +03:00
parent d869f2d5ea
commit 6dee0ad09e
9 changed files with 66 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -3168,10 +3168,11 @@ spec:
type: object
type: array
imageName:
description: The container image name to use
description: ImageName is the container image name to use.
type: string
initImageName:
description: The init container image name to use
description: InitImageName is the init container image name
to use.
type: string
type: object
calico:

4
pkg/apis/kops/networking.go
View File

@ -248,9 +248,9 @@ type RomanaNetworkingSpec struct {
// AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking
type AmazonVPCNetworkingSpec struct {
// The container image name to use
// ImageName is the container image name to use.
ImageName string `json:"imageName,omitempty"`
// The init container image name to use
// InitImageName is the init container image name to use.
InitImageName string `json:"initImageName,omitempty"`
// Env is a list of environment variables to set in the container.
Env []EnvVar `json:"env,omitempty"`

4
pkg/apis/kops/v1alpha2/networking.go
View File

@ -248,9 +248,9 @@ type RomanaNetworkingSpec struct {
// AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking
type AmazonVPCNetworkingSpec struct {
// The container image name to use
// ImageName is the container image name to use.
ImageName string `json:"imageName,omitempty"`
// The init container image name to use
// InitImageName is the init container image name to use.
InitImageName string `json:"initImageName,omitempty"`
// Env is a list of environment variables to set in the container.
Env []EnvVar `json:"env,omitempty"`

74
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -106,48 +106,50 @@
- "fargate"
"containers":
- "env":
- "name": "ADDITIONAL_ENI_TAGS"
"value": "{}"
- "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
"value": "true"
- "name": "AWS_VPC_ENI_MTU"
"value": "9001"
- "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
"value": "false"
- "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
"value": "false"
- "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
"value": "false"
- "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
"value": "DEBUG"
- "name": "AWS_VPC_K8S_CNI_LOG_FILE"
"value": "/host/var/log/aws-routed-eni/ipamd.log"
- "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
"value": "prng"
- "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
"value": "eni"
- "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
"value": "/var/log/aws-routed-eni/plugin.log"
- "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
"value": "DEBUG"
- "name": "DISABLE_INTROSPECTION"
"value": "false"
- "name": "DISABLE_METRICS"
"value": "false"
- "name": "ENABLE_POD_ENI"
"value": "false"
{{- range $name, $value := AmazonVpcEnvVars }}
- "name": "{{ $name }}"
"value": "{{ $value }}"
{{- end }}
# The below envs are commented-out on purpose and replaced by the above range.
# See https://github.com/kubernetes/kops/issues/11144 for more context.
# - "name": "ADDITIONAL_ENI_TAGS"
# "value": "{}"
# - "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
# "value": "true"
# - "name": "AWS_VPC_ENI_MTU"
# "value": "9001"
# - "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
# "value": "false"
# - "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
# "value": "false"
# - "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
# "value": "false"
# - "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
# "value": "DEBUG"
# - "name": "AWS_VPC_K8S_CNI_LOG_FILE"
# "value": "/host/var/log/aws-routed-eni/ipamd.log"
# - "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
# "value": "prng"
# - "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
# "value": "eni"
# - "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
# "value": "/var/log/aws-routed-eni/plugin.log"
# - "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
# "value": "DEBUG"
# - "name": "DISABLE_INTROSPECTION"
# "value": "false"
# - "name": "DISABLE_METRICS"
# "value": "false"
# - "name": "ENABLE_POD_ENI"
# "value": "false"
- "name": "MY_NODE_NAME"
"valueFrom":
"fieldRef":
"fieldPath": "spec.nodeName"
- "name": "WARM_ENI_TARGET"
"value": "1"
# - "name": "WARM_ENI_TARGET"
# "value": "1"
- "name": "CLUSTER_NAME"
"value": "{{ ClusterName }}"
{{- range .Networking.AmazonVPC.Env }}
- "name": "{{ .Name }}"
"value": "{{ .Value }}"
{{- end }}
"image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0" }}"
"imagePullPolicy": "Always"
"livenessProbe":

13
upup/pkg/fi/cloudup/template_functions.go
View File

@ -149,6 +149,19 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
}
}
if cluster.Spec.Networking != nil && cluster.Spec.Networking.AmazonVPC != nil {
c := cluster.Spec.Networking.AmazonVPC
dest["AmazonVpcEnvVars"] = func() map[string]string {
envVars := map[string]string{
"AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false",
}
for _, e := range c.Env {
envVars[e.Name] = e.Value
}
return envVars
}
}
if cluster.Spec.Networking != nil && cluster.Spec.Networking.Calico != nil {
c := cluster.Spec.Networking.Calico
dest["CalicoIPv4PoolIPIPMode"] = func() string {

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -54,7 +54,7 @@ spec:
version: 1.17.0
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: b89f35a6abb88822739e20ae2ad7776d8160e806
manifestHash: fea48420a1f8d5e929b59e08fb96612032d8e651
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:

36
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -132,48 +132,18 @@ spec:
- fargate
containers:
- env:
- name: ADDITIONAL_ENI_TAGS
value: '{}'
- name: AWS_VPC_CNI_NODE_PORT_SUPPORT
value: "true"
- name: AWS_VPC_ENI_MTU
value: "9001"
- name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
value: "false"
- name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG
value: "false"
- name: AWS_VPC_K8S_CNI_EXTERNALSNAT
value: "false"
- name: AWS_VPC_K8S_CNI_LOGLEVEL
value: DEBUG
- name: AWS_VPC_K8S_CNI_LOG_FILE
value: /host/var/log/aws-routed-eni/ipamd.log
- name: AWS_VPC_K8S_CNI_RANDOMIZESNAT
value: prng
- name: AWS_VPC_K8S_CNI_VETHPREFIX
value: eni
- name: AWS_VPC_K8S_PLUGIN_LOG_FILE
value: /var/log/aws-routed-eni/plugin.log
- name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL
value: DEBUG
- name: DISABLE_INTROSPECTION
value: "false"
- name: DISABLE_METRICS
value: "false"
- name: ENABLE_POD_ENI
value: "false"
value: debug
- name: WARM_IP_TARGET
value: "10"
- name: MY_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: WARM_ENI_TARGET
value: "1"
- name: CLUSTER_NAME
value: minimal.example.com
- name: WARM_IP_TARGET
value: "10"
- name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0
imagePullPolicy: Always
livenessProbe:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -54,7 +54,7 @@ spec:
version: 1.17.0
- id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: b89f35a6abb88822739e20ae2ad7776d8160e806
manifestHash: fea48420a1f8d5e929b59e08fb96612032d8e651
name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all
selector:

36
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -132,48 +132,18 @@ spec:
- fargate
containers:
- env:
- name: ADDITIONAL_ENI_TAGS
value: '{}'
- name: AWS_VPC_CNI_NODE_PORT_SUPPORT
value: "true"
- name: AWS_VPC_ENI_MTU
value: "9001"
- name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
value: "false"
- name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG
value: "false"
- name: AWS_VPC_K8S_CNI_EXTERNALSNAT
value: "false"
- name: AWS_VPC_K8S_CNI_LOGLEVEL
value: DEBUG
- name: AWS_VPC_K8S_CNI_LOG_FILE
value: /host/var/log/aws-routed-eni/ipamd.log
- name: AWS_VPC_K8S_CNI_RANDOMIZESNAT
value: prng
- name: AWS_VPC_K8S_CNI_VETHPREFIX
value: eni
- name: AWS_VPC_K8S_PLUGIN_LOG_FILE
value: /var/log/aws-routed-eni/plugin.log
- name: AWS_VPC_K8S_PLUGIN_LOG_LEVEL
value: DEBUG
- name: DISABLE_INTROSPECTION
value: "false"
- name: DISABLE_METRICS
value: "false"
- name: ENABLE_POD_ENI
value: "false"
value: debug
- name: WARM_IP_TARGET
value: "10"
- name: MY_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: WARM_ENI_TARGET
value: "1"
- name: CLUSTER_NAME
value: minimal.example.com
- name: WARM_IP_TARGET
value: "10"
- name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.8.0
imagePullPolicy: Always
livenessProbe: