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

Update automatically generated files

This commit is contained in:
John Gardiner Myers 2021-10-26 16:09:28 -07:00
parent fdc128fda4
commit ad6235e428
20 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4537,12 +4537,7 @@ spec:
may be removed in the future. Setting this has no effect.
type: object
containerRuntimeLabels:
description: 'ContainerRuntimeLabels enables fetching of container-runtime
labels from the specified container runtime and associating
them with endpoints. Supported values are: "none", "containerd",
"crio", "docker", "auto" As of Cilium 1.7.0, Cilium no longer
fetches information from the container runtime and this
field is ignored. Default: none'
description: ContainerRuntimeLabels is unused.
type: string
cpuRequest:
anyOf:

3
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -1874,7 +1874,7 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
// INFO: in.ContainerRuntimeLabels opted out of conversion generation
out.Ipam = in.Ipam
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
@ -1986,7 +1986,6 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
out.Ipam = in.Ipam
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes

2
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -1822,7 +1822,6 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
out.Ipam = in.Ipam
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
@ -1934,7 +1933,6 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.ContainerRuntimeLabels = in.ContainerRuntimeLabels
out.Ipam = in.Ipam
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes

1
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -182,7 +182,6 @@ spec:
bpfNeighGlobalMax: 524288
bpfPolicyMapMax: 16384
clusterName: default
containerRuntimeLabels: none
cpuRequest: 25m
disableCNPStatusUpdates: true
disableMasquerade: false

2
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: e189fc92d397104b4526baecfe33054943a6fd5279802196bfbef4ec749bde76
manifestHash: 35f45e466345bbf440198f73fe9c6ab8f87ae8ed7ab714c9930dd76a5fdd60f0
name: networking.cilium.io
needsRollingUpdate: all
selector:

1
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content
View File

@ -38,7 +38,6 @@ data:
bpf-policy-map-max: "16384"
cgroup-root: /run/cilium/cgroupv2
cluster-name: default
container-runtime: none
debug: "false"
disable-cnp-status-updates: "true"
disable-endpoint-crd: "false"

1
tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -175,7 +175,6 @@ spec:
bpfNeighGlobalMax: 524288
bpfPolicyMapMax: 16384
clusterName: default
containerRuntimeLabels: none
cpuRequest: 25m
disableCNPStatusUpdates: true
disableMasquerade: false

2
tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: b953f6c7cf1b1e1e58115981b21cf5837f5b181a834c47fb51e884ea91b45c45
manifestHash: d3bfdf14497029e5668a72dab8413a302db8899ce951a99661922c2f52af135b
name: networking.cilium.io
needsRollingUpdate: all
selector:

1
tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View File

@ -38,7 +38,6 @@ data:
bpf-policy-map-max: "16384"
cgroup-root: /run/cilium/cgroupv2
cluster-name: default
container-runtime: none
debug: "false"
disable-cnp-status-updates: "true"
disable-endpoint-crd: "false"

1
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -180,7 +180,6 @@ spec:
bpfNeighGlobalMax: 524288
bpfPolicyMapMax: 16384
clusterName: default
containerRuntimeLabels: none
cpuRequest: 25m
disableCNPStatusUpdates: true
disableMasquerade: false

2
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content
View File

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: networking.cilium.io/k8s-1.12-v1.8.yaml
manifestHash: f4eb8cc3bc5a8c402c357bec19bb3668edc2d9b65f29c5afd3d62a42dbaf9786
manifestHash: e7759ad14e563a755dad14e97624613286e104125197cf74884ed0b925607a5b
name: networking.cilium.io
needsRollingUpdate: all
selector:

1
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.12_content
View File

@ -4,7 +4,6 @@ data:
bpf-ct-global-any-max: "262144"
bpf-ct-global-tcp-max: "524288"
cluster-name: default
container-runtime: none
debug: "false"
enable-ipv4: "true"
enable-ipv6: "false"

1
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -183,7 +183,6 @@ spec:
bpfNeighGlobalMax: 524288
bpfPolicyMapMax: 16384
clusterName: default
containerRuntimeLabels: none
cpuRequest: 25m
disableCNPStatusUpdates: true
disableMasquerade: true

2
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content
View File

@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: 12cfd585141014ba65ea2a1aec21f8012ac51e49466b35873c571bddf6b860db
manifestHash: 81c2f82f22bdb5c2743587a04d9c96ac207cd37306124ed72274adf8c44378f5
name: networking.cilium.io
needsRollingUpdate: all
selector:

1
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content
View File

@ -40,7 +40,6 @@ data:
bpf-policy-map-max: "16384"
cgroup-root: /run/cilium/cgroupv2
cluster-name: default
container-runtime: none
debug: "false"
disable-cnp-status-updates: "true"
disable-endpoint-crd: "false"

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

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: fb14b81c0d752392e5880b57adb1225d87fadd790edbcb15aecc54fd3d1d4835
manifestHash: 0f2a1d439e26214d53ea5a403d87f2ef7e7168bf0048f9be8c5b7d5e1cc7d963
name: networking.cilium.io
needsRollingUpdate: all
selector:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml
View File

@ -68,7 +68,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: fb14b81c0d752392e5880b57adb1225d87fadd790edbcb15aecc54fd3d1d4835
manifestHash: 0f2a1d439e26214d53ea5a403d87f2ef7e7168bf0048f9be8c5b7d5e1cc7d963
name: networking.cilium.io
needsRollingUpdate: all
selector:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View File

@ -61,7 +61,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: fb14b81c0d752392e5880b57adb1225d87fadd790edbcb15aecc54fd3d1d4835
manifestHash: 0f2a1d439e26214d53ea5a403d87f2ef7e7168bf0048f9be8c5b7d5e1cc7d963
name: networking.cilium.io
needsRollingUpdate: all
selector:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml
View File

@ -75,7 +75,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: fb14b81c0d752392e5880b57adb1225d87fadd790edbcb15aecc54fd3d1d4835
manifestHash: 0f2a1d439e26214d53ea5a403d87f2ef7e7168bf0048f9be8c5b7d5e1cc7d963
name: networking.cilium.io
needsRollingUpdate: all
selector:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View File

@ -68,7 +68,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
manifestHash: fb14b81c0d752392e5880b57adb1225d87fadd790edbcb15aecc54fd3d1d4835
manifestHash: 0f2a1d439e26214d53ea5a403d87f2ef7e7168bf0048f9be8c5b7d5e1cc7d963
name: networking.cilium.io
needsRollingUpdate: all
selector: