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

Merge pull request #12816 from johngmyers/rename-fields-2 

Rename fields to fit acronym conventions
This commit is contained in:
Kubernetes Prow Robot 2021-11-24 23:14:33 -08:00 committed by GitHub
parent 0012928f23 e5a6b79c19
commit 0e56286aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1005,7 +1005,7 @@ spec:
type: string
volumeIops:
description: If volume type is io1, then we need to specify
the number of Iops.
the number of IOPS.
format: int32
type: integer
volumeSize:
@ -4698,7 +4698,7 @@ spec:
to wait before using a changed identity. Default: 5s'
type: string
ipam:
description: 'Ipam specifies the IP address allocation mode
description: 'IPAM specifies the IP address allocation mode
to use. Possible values are "crd" and "eni". "eni" will
use AWS native networking for pods. Eni requires masquerade
to be set to false. "crd" will use CRDs for controlling
@ -4835,12 +4835,12 @@ spec:
description: StateDir is unused.
type: string
toFqdnsDnsRejectResponseCode:
description: 'ToFqdnsDNSRejectResponseCode sets the DNS response
description: 'ToFQDNsDNSRejectResponseCode sets the DNS response
code for rejecting DNS requests. Possible values are "nameError"
or "refused". Default: refused'
type: string
toFqdnsEnablePoller:
description: 'ToFqdnsEnablePoller replaces the DNS proxy-based
description: 'ToFQDNsEnablePoller replaces the DNS proxy-based
implementation of FQDN policies with the less powerful legacy
implementation. Default: false'
type: boolean

4
k8s/crds/kops.k8s.io_instancegroups.yaml
View File

@ -775,7 +775,7 @@ spec:
root volume encryption
type: string
rootVolumeIops:
description: RootVolumeIops is the provisioned IOPS when the volume
description: RootVolumeIOPS is the provisioned IOPS when the volume
type is io1, io2 or gp3 (AWS only).
format: int32
type: integer
@ -890,7 +890,7 @@ spec:
description: Encrypted indicates you want to encrypt the volume
type: boolean
iops:
description: Iops is the provisioned IOPS for the volume when
description: IOPS is the provisioned IOPS for the volume when
the volume type is io1, io2 or gp3 (AWS only).
format: int64
type: integer

2
k8s/crds/kops.k8s.io_keysets.yaml
View File

@ -66,7 +66,7 @@ spec:
type: object
type: array
primaryId:
description: PrimaryId is the id of the key used to make new signatures.
description: PrimaryID is the id of the key used to make new signatures.
type: string
type:
description: Type is the type of the Keyset (PKI keypair, or secret

2
nodeup/pkg/model/context.go
View File

@ -373,7 +373,7 @@ func (c *NodeupModelContext) UseKopsControllerForNodeBootstrap() bool {
// UsesSecondaryIP checks if the CNI in use attaches secondary interfaces to the host.
func (c *NodeupModelContext) UsesSecondaryIP() bool {
return (c.Cluster.Spec.Networking.CNI != nil && c.Cluster.Spec.Networking.CNI.UsesSecondaryIP) || c.Cluster.Spec.Networking.AmazonVPC != nil ||
(c.Cluster.Spec.Networking.Cilium != nil && c.Cluster.Spec.Networking.Cilium.Ipam == kops.CiliumIpamEni)
(c.Cluster.Spec.Networking.Cilium != nil && c.Cluster.Spec.Networking.Cilium.IPAM == kops.CiliumIpamEni)
}
// UseBootstrapTokens checks if we are using bootstrap tokens

2
nodeup/pkg/model/kubelet_test.go
View File

@ -333,7 +333,7 @@ const nextKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIBOgIBAAJBAKOE64nZbH+GM91AIr
func simplePrivateKeyset(cert, key string) *kops.Keyset {
return &kops.Keyset{
Spec: kops.KeysetSpec{
PrimaryId: "3",
PrimaryID: "3",
Keys: []kops.KeysetItem{
{
Id: "3",

2
pkg/apis/kops/cluster.go
View File

@ -619,7 +619,7 @@ type EtcdMemberSpec struct {
InstanceGroup *string `json:"instanceGroup,omitempty"`
// VolumeType is the underlying cloud storage class
VolumeType *string `json:"volumeType,omitempty"`
// If volume type is io1, then we need to specify the number of Iops.
// If volume type is io1, then we need to specify the number of IOPS.
VolumeIOPS *int32 `json:"volumeIOPS,omitempty"`
// Parameter for disks that support provisioned throughput
VolumeThroughput *int32 `json:"volumeThroughput,omitempty"`

12
pkg/apis/kops/instancegroup.go
View File

@ -102,8 +102,8 @@ type InstanceGroupSpec struct {
RootVolumeSize *int32 `json:"rootVolumeSize,omitempty"`
// RootVolumeType is the type of the EBS root volume to use (e.g. gp2)
RootVolumeType *string `json:"rootVolumeType,omitempty"`
// RootVolumeIops is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIops *int32 `json:"rootVolumeIops,omitempty"`
// RootVolumeIOPS is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIOPS *int32 `json:"rootVolumeIOPS,omitempty"`
// RootVolumeThroughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
RootVolumeThroughput *int32 `json:"rootVolumeThroughput,omitempty"`
// RootVolumeOptimization enables EBS optimization for an instance
@ -130,7 +130,7 @@ type InstanceGroupSpec struct {
// CPUCredits is the credit option for CPU Usage on burstable instance types (AWS only)
CPUCredits *string `json:"cpuCredits,omitempty"`
// AssociatePublicIP is true if we want instances to have a public IP
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
AssociatePublicIP *bool `json:"associatePublicIP,omitempty"`
// AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
// CloudLabels defines additional tags or labels on cloud provider resources
@ -255,8 +255,8 @@ type VolumeSpec struct {
Device string `json:"device,omitempty"`
// Encrypted indicates you want to encrypt the volume
Encrypted *bool `json:"encrypted,omitempty"`
// Iops is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
Iops *int64 `json:"iops,omitempty"`
// IOPS is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
IOPS *int64 `json:"iops,omitempty"`
// Throughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
Throughput *int64 `json:"throughput,omitempty"`
// Key is the encryption key identifier for the volume
@ -336,5 +336,5 @@ type LoadBalancer struct {
// LoadBalancerName to associate with this instance group (AWS ELB)
LoadBalancerName *string `json:"loadBalancerName,omitempty"`
// TargetGroupARN to associate with this instance group (AWS ALB/NLB)
TargetGroupARN *string `json:"targetGroupArn,omitempty"`
TargetGroupARN *string `json:"targetGroupARN,omitempty"`
}

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

@ -71,8 +71,8 @@ type KeysetSpec struct {
// Type is the type of the Keyset (PKI keypair, or secret token)
Type KeysetType `json:"type,omitempty"`
// PrimaryId is the id of the key used to make new signatures.
PrimaryId string `json:"primaryId,omitempty"`
// PrimaryID is the id of the key used to make new signatures.
PrimaryID string `json:"primaryID,omitempty"`
// Keys is the set of keys that make up the keyset
Keys []KeysetItem `json:"keys,omitempty"`

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

@ -370,22 +370,22 @@ type CiliumNetworkingSpec struct {
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage,omitempty"`
// ClusterName is the name of the cluster. It is only relevant when building a mesh of clusters.
ClusterName string `json:"clusterName,omitempty"`
// ToFqdnsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// ToFQDNsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// Possible values are "nameError" or "refused".
// Default: refused
ToFqdnsDNSRejectResponseCode string `json:"toFqdnsDnsRejectResponseCode,omitempty"`
// ToFqdnsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
ToFQDNsDNSRejectResponseCode string `json:"toFQDNsDNSRejectResponseCode,omitempty"`
// ToFQDNsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
// with the less powerful legacy implementation.
// Default: false
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller,omitempty"`
// Ipam specifies the IP address allocation mode to use.
ToFQDNsEnablePoller bool `json:"toFQDNsEnablePoller,omitempty"`
// IPAM specifies the IP address allocation mode to use.
// Possible values are "crd" and "eni".
// "eni" will use AWS native networking for pods. Eni requires masquerade to be set to false.
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR.
// Default: "kubernetes".
Ipam string `json:"ipam,omitempty"`
IPAM string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall,omitempty"`

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

@ -33,6 +33,6 @@ type EtcdMemberStatus struct {
// Name is the name of the member within the etcd cluster
Name string `json:"name,omitempty"`
// volumeId is the id of the cloud volume (e.g. the AWS volume id)
VolumeId string `json:"volumeId,omitempty"`
// VolumeID is the id of the cloud volume (e.g. the AWS volume id)
VolumeID string `json:"volumeID,omitempty"`
}

2
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -628,7 +628,7 @@ type EtcdMemberSpec struct {
InstanceGroup *string `json:"instanceGroup,omitempty"`
// VolumeType is the underlying cloud storage class
VolumeType *string `json:"volumeType,omitempty"`
// If volume type is io1, then we need to specify the number of Iops.
// If volume type is io1, then we need to specify the number of IOPS.
VolumeIOPS *int32 `json:"volumeIops,omitempty"`
// Parameter for disks that support provisioned throughput
VolumeThroughput *int32 `json:"volumeThroughput,omitempty"`

8
pkg/apis/kops/v1alpha2/instancegroup.go
View File

@ -67,8 +67,8 @@ type InstanceGroupSpec struct {
RootVolumeSize *int32 `json:"rootVolumeSize,omitempty"`
// RootVolumeType is the type of the EBS root volume to use (e.g. gp2)
RootVolumeType *string `json:"rootVolumeType,omitempty"`
// RootVolumeIops is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIops *int32 `json:"rootVolumeIops,omitempty"`
// RootVolumeIOPS is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIOPS *int32 `json:"rootVolumeIops,omitempty"`
// RootVolumeThroughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
RootVolumeThroughput *int32 `json:"rootVolumeThroughput,omitempty"`
// RootVolumeOptimization enables EBS optimization for an instance
@ -205,8 +205,8 @@ type VolumeSpec struct {
Device string `json:"device,omitempty"`
// Encrypted indicates you want to encrypt the volume
Encrypted *bool `json:"encrypted,omitempty"`
// Iops is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
Iops *int64 `json:"iops,omitempty"`
// IOPS is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
IOPS *int64 `json:"iops,omitempty"`
// Throughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
Throughput *int64 `json:"throughput,omitempty"`
// Key is the encryption key identifier for the volume

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

@ -66,8 +66,8 @@ type KeysetSpec struct {
// Type is the type of the Keyset (PKI keypair, or secret token)
Type KeysetType `json:"type,omitempty"`
// PrimaryId is the id of the key used to make new signatures.
PrimaryId string `json:"primaryId,omitempty"`
// PrimaryID is the id of the key used to make new signatures.
PrimaryID string `json:"primaryId,omitempty"`
// Keys is the set of keys that make up the keyset
Keys []KeysetItem `json:"keys,omitempty"`

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

@ -517,25 +517,25 @@ type CiliumNetworkingSpec struct {
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage,omitempty"`
// ClusterName is the name of the cluster. It is only relevant when building a mesh of clusters.
ClusterName string `json:"clusterName,omitempty"`
// ToFqdnsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// ToFQDNsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// Possible values are "nameError" or "refused".
// Default: refused
ToFqdnsDNSRejectResponseCode string `json:"toFqdnsDnsRejectResponseCode,omitempty"`
// ToFqdnsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
ToFQDNsDNSRejectResponseCode string `json:"toFqdnsDnsRejectResponseCode,omitempty"`
// ToFQDNsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
// with the less powerful legacy implementation.
// Default: false
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller,omitempty"`
ToFQDNsEnablePoller bool `json:"toFqdnsEnablePoller,omitempty"`
// ContainerRuntimeLabels is unused.
// +k8s:conversion-gen=false
ContainerRuntimeLabels string `json:"containerRuntimeLabels,omitempty"`
// Ipam specifies the IP address allocation mode to use.
// IPAM specifies the IP address allocation mode to use.
// Possible values are "crd" and "eni".
// "eni" will use AWS native networking for pods. Eni requires masquerade to be set to false.
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR.
// Default: "kubernetes".
Ipam string `json:"ipam,omitempty"`
IPAM string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall,omitempty"`

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

@ -1930,10 +1930,10 @@ func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.PreallocateBPFMaps = in.PreallocateBPFMaps
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.ToFQDNsDNSRejectResponseCode = in.ToFQDNsDNSRejectResponseCode
out.ToFQDNsEnablePoller = in.ToFQDNsEnablePoller
// INFO: in.ContainerRuntimeLabels opted out of conversion generation
out.Ipam = in.Ipam
out.IPAM = in.IPAM
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
out.EnableHostReachableServices = in.EnableHostReachableServices
@ -1996,9 +1996,9 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *
out.PreallocateBPFMaps = in.PreallocateBPFMaps
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.Ipam = in.Ipam
out.ToFQDNsDNSRejectResponseCode = in.ToFQDNsDNSRejectResponseCode
out.ToFQDNsEnablePoller = in.ToFQDNsEnablePoller
out.IPAM = in.IPAM
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
out.EnableHostReachableServices = in.EnableHostReachableServices
@ -4169,7 +4169,7 @@ func autoConvert_v1alpha2_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan
out.MachineType = in.MachineType
out.RootVolumeSize = in.RootVolumeSize
out.RootVolumeType = in.RootVolumeType
out.RootVolumeIops = in.RootVolumeIops
out.RootVolumeIOPS = in.RootVolumeIOPS
out.RootVolumeThroughput = in.RootVolumeThroughput
out.RootVolumeOptimization = in.RootVolumeOptimization
// INFO: in.RootVolumeDeleteOnTermination opted out of conversion generation
@ -4331,7 +4331,7 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha2_InstanceGroupSpec(in *kops.I
out.MachineType = in.MachineType
out.RootVolumeSize = in.RootVolumeSize
out.RootVolumeType = in.RootVolumeType
out.RootVolumeIops = in.RootVolumeIops
out.RootVolumeIOPS = in.RootVolumeIOPS
out.RootVolumeThroughput = in.RootVolumeThroughput
out.RootVolumeOptimization = in.RootVolumeOptimization
out.RootVolumeEncryption = in.RootVolumeEncryption
@ -4609,7 +4609,7 @@ func Convert_kops_KeysetList_To_v1alpha2_KeysetList(in *kops.KeysetList, out *Ke
func autoConvert_v1alpha2_KeysetSpec_To_kops_KeysetSpec(in *KeysetSpec, out *kops.KeysetSpec, s conversion.Scope) error {
out.Type = kops.KeysetType(in.Type)
out.PrimaryId = in.PrimaryId
out.PrimaryID = in.PrimaryID
if in.Keys != nil {
in, out := &in.Keys, &out.Keys
*out = make([]kops.KeysetItem, len(*in))
@ -4631,7 +4631,7 @@ func Convert_v1alpha2_KeysetSpec_To_kops_KeysetSpec(in *KeysetSpec, out *kops.Ke
func autoConvert_kops_KeysetSpec_To_v1alpha2_KeysetSpec(in *kops.KeysetSpec, out *KeysetSpec, s conversion.Scope) error {
out.Type = KeysetType(in.Type)
out.PrimaryId = in.PrimaryId
out.PrimaryID = in.PrimaryID
if in.Keys != nil {
in, out := &in.Keys, &out.Keys
*out = make([]KeysetItem, len(*in))
@ -6921,7 +6921,7 @@ func autoConvert_v1alpha2_VolumeSpec_To_kops_VolumeSpec(in *VolumeSpec, out *kop
out.DeleteOnTermination = in.DeleteOnTermination
out.Device = in.Device
out.Encrypted = in.Encrypted
out.Iops = in.Iops
out.IOPS = in.IOPS
out.Throughput = in.Throughput
out.Key = in.Key
out.Size = in.Size
@ -6938,7 +6938,7 @@ func autoConvert_kops_VolumeSpec_To_v1alpha2_VolumeSpec(in *kops.VolumeSpec, out
out.DeleteOnTermination = in.DeleteOnTermination
out.Device = in.Device
out.Encrypted = in.Encrypted
out.Iops = in.Iops
out.IOPS = in.IOPS
out.Throughput = in.Throughput
out.Key = in.Key
out.Size = in.Size

8
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -2196,8 +2196,8 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
*out = new(string)
**out = **in
}
if in.RootVolumeIops != nil {
in, out := &in.RootVolumeIops, &out.RootVolumeIops
if in.RootVolumeIOPS != nil {
in, out := &in.RootVolumeIOPS, &out.RootVolumeIOPS
*out = new(int32)
**out = **in
}
@ -4898,8 +4898,8 @@ func (in *VolumeSpec) DeepCopyInto(out *VolumeSpec) {
*out = new(bool)
**out = **in
}
if in.Iops != nil {
in, out := &in.Iops, &out.Iops
if in.IOPS != nil {
in, out := &in.IOPS, &out.IOPS
*out = new(int64)
**out = **in
}

2
pkg/apis/kops/v1alpha3/cluster.go
View File

@ -584,7 +584,7 @@ type EtcdMemberSpec struct {
InstanceGroup *string `json:"instanceGroup,omitempty"`
// VolumeType is the underlying cloud storage class
VolumeType *string `json:"volumeType,omitempty"`
// If volume type is io1, then we need to specify the number of Iops.
// If volume type is io1, then we need to specify the number of IOPS.
VolumeIOPS *int32 `json:"volumeIOPS,omitempty"`
// Parameter for disks that support provisioned throughput
VolumeThroughput *int32 `json:"volumeThroughput,omitempty"`

12
pkg/apis/kops/v1alpha3/instancegroup.go
View File

@ -67,8 +67,8 @@ type InstanceGroupSpec struct {
RootVolumeSize *int32 `json:"rootVolumeSize,omitempty"`
// RootVolumeType is the type of the EBS root volume to use (e.g. gp2)
RootVolumeType *string `json:"rootVolumeType,omitempty"`
// RootVolumeIops is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIops *int32 `json:"rootVolumeIops,omitempty"`
// RootVolumeIOPS is the provisioned IOPS when the volume type is io1, io2 or gp3 (AWS only).
RootVolumeIOPS *int32 `json:"rootVolumeIOPS,omitempty"`
// RootVolumeThroughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
RootVolumeThroughput *int32 `json:"rootVolumeThroughput,omitempty"`
// RootVolumeOptimization enables EBS optimization for an instance
@ -95,7 +95,7 @@ type InstanceGroupSpec struct {
// CPUCredits is the credit option for CPU Usage on burstable instance types (AWS only)
CPUCredits *string `json:"cpuCredits,omitempty"`
// AssociatePublicIP is true if we want instances to have a public IP
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
AssociatePublicIP *bool `json:"associatePublicIP,omitempty"`
// AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
// CloudLabels defines additional tags or labels on cloud provider resources
@ -202,8 +202,8 @@ type VolumeSpec struct {
Device string `json:"device,omitempty"`
// Encrypted indicates you want to encrypt the volume
Encrypted *bool `json:"encrypted,omitempty"`
// Iops is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
Iops *int64 `json:"iops,omitempty"`
// IOPS is the provisioned IOPS for the volume when the volume type is io1, io2 or gp3 (AWS only).
IOPS *int64 `json:"iops,omitempty"`
// Throughput is the volume throughput in MBps when the volume type is gp3 (AWS only).
Throughput *int64 `json:"throughput,omitempty"`
// Key is the encryption key identifier for the volume
@ -241,5 +241,5 @@ type LoadBalancer struct {
// LoadBalancerName to associate with this instance group (AWS ELB)
LoadBalancerName *string `json:"loadBalancerName,omitempty"`
// TargetGroupARN to associate with this instance group (AWS ALB/NLB)
TargetGroupARN *string `json:"targetGroupArn,omitempty"`
TargetGroupARN *string `json:"targetGroupARN,omitempty"`
}

4
pkg/apis/kops/v1alpha3/keyset.go
View File

@ -66,8 +66,8 @@ type KeysetSpec struct {
// Type is the type of the Keyset (PKI keypair, or secret token)
Type KeysetType `json:"type,omitempty"`
// PrimaryId is the id of the key used to make new signatures.
PrimaryId string `json:"primaryId,omitempty"`
// PrimaryID is the id of the key used to make new signatures.
PrimaryID string `json:"primaryID,omitempty"`
// Keys is the set of keys that make up the keyset
Keys []KeysetItem `json:"keys,omitempty"`

12
pkg/apis/kops/v1alpha3/networking.go
View File

@ -354,22 +354,22 @@ type CiliumNetworkingSpec struct {
SidecarIstioProxyImage string `json:"sidecarIstioProxyImage,omitempty"`
// ClusterName is the name of the cluster. It is only relevant when building a mesh of clusters.
ClusterName string `json:"clusterName,omitempty"`
// ToFqdnsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// ToFQDNsDNSRejectResponseCode sets the DNS response code for rejecting DNS requests.
// Possible values are "nameError" or "refused".
// Default: refused
ToFqdnsDNSRejectResponseCode string `json:"toFqdnsDnsRejectResponseCode,omitempty"`
// ToFqdnsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
ToFQDNsDNSRejectResponseCode string `json:"toFQDNsDNSRejectResponseCode,omitempty"`
// ToFQDNsEnablePoller replaces the DNS proxy-based implementation of FQDN policies
// with the less powerful legacy implementation.
// Default: false
ToFqdnsEnablePoller bool `json:"toFqdnsEnablePoller,omitempty"`
// Ipam specifies the IP address allocation mode to use.
ToFQDNsEnablePoller bool `json:"toFQDNsEnablePoller,omitempty"`
// IPAM specifies the IP address allocation mode to use.
// Possible values are "crd" and "eni".
// "eni" will use AWS native networking for pods. Eni requires masquerade to be set to false.
// "crd" will use CRDs for controlling IP address management.
// "hostscope" will use hostscope IPAM mode.
// "kubernetes" will use addersing based on node pod CIDR.
// Default: "kubernetes".
Ipam string `json:"ipam,omitempty"`
IPAM string `json:"ipam,omitempty"`
// IPTablesRulesNoinstall disables installing the base IPTables rules used for masquerading and kube-proxy.
// Default: false
IPTablesRulesNoinstall bool `json:"IPTablesRulesNoinstall,omitempty"`

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

@ -1832,9 +1832,9 @@ func autoConvert_v1alpha3_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *
out.PreallocateBPFMaps = in.PreallocateBPFMaps
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.Ipam = in.Ipam
out.ToFQDNsDNSRejectResponseCode = in.ToFQDNsDNSRejectResponseCode
out.ToFQDNsEnablePoller = in.ToFQDNsEnablePoller
out.IPAM = in.IPAM
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
out.EnableHostReachableServices = in.EnableHostReachableServices
@ -1892,9 +1892,9 @@ func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *
out.PreallocateBPFMaps = in.PreallocateBPFMaps
out.SidecarIstioProxyImage = in.SidecarIstioProxyImage
out.ClusterName = in.ClusterName
out.ToFqdnsDNSRejectResponseCode = in.ToFqdnsDNSRejectResponseCode
out.ToFqdnsEnablePoller = in.ToFqdnsEnablePoller
out.Ipam = in.Ipam
out.ToFQDNsDNSRejectResponseCode = in.ToFQDNsDNSRejectResponseCode
out.ToFQDNsEnablePoller = in.ToFQDNsEnablePoller
out.IPAM = in.IPAM
out.IPTablesRulesNoinstall = in.IPTablesRulesNoinstall
out.AutoDirectNodeRoutes = in.AutoDirectNodeRoutes
out.EnableHostReachableServices = in.EnableHostReachableServices
@ -4028,7 +4028,7 @@ func autoConvert_v1alpha3_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan
out.MachineType = in.MachineType
out.RootVolumeSize = in.RootVolumeSize
out.RootVolumeType = in.RootVolumeType
out.RootVolumeIops = in.RootVolumeIops
out.RootVolumeIOPS = in.RootVolumeIOPS
out.RootVolumeThroughput = in.RootVolumeThroughput
out.RootVolumeOptimization = in.RootVolumeOptimization
out.RootVolumeEncryption = in.RootVolumeEncryption
@ -4189,7 +4189,7 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha3_InstanceGroupSpec(in *kops.I
out.MachineType = in.MachineType
out.RootVolumeSize = in.RootVolumeSize
out.RootVolumeType = in.RootVolumeType
out.RootVolumeIops = in.RootVolumeIops
out.RootVolumeIOPS = in.RootVolumeIOPS
out.RootVolumeThroughput = in.RootVolumeThroughput
out.RootVolumeOptimization = in.RootVolumeOptimization
out.RootVolumeEncryption = in.RootVolumeEncryption
@ -4467,7 +4467,7 @@ func Convert_kops_KeysetList_To_v1alpha3_KeysetList(in *kops.KeysetList, out *Ke
func autoConvert_v1alpha3_KeysetSpec_To_kops_KeysetSpec(in *KeysetSpec, out *kops.KeysetSpec, s conversion.Scope) error {
out.Type = kops.KeysetType(in.Type)
out.PrimaryId = in.PrimaryId
out.PrimaryID = in.PrimaryID
if in.Keys != nil {
in, out := &in.Keys, &out.Keys
*out = make([]kops.KeysetItem, len(*in))
@ -4489,7 +4489,7 @@ func Convert_v1alpha3_KeysetSpec_To_kops_KeysetSpec(in *KeysetSpec, out *kops.Ke
func autoConvert_kops_KeysetSpec_To_v1alpha3_KeysetSpec(in *kops.KeysetSpec, out *KeysetSpec, s conversion.Scope) error {
out.Type = KeysetType(in.Type)
out.PrimaryId = in.PrimaryId
out.PrimaryID = in.PrimaryID
if in.Keys != nil {
in, out := &in.Keys, &out.Keys
*out = make([]KeysetItem, len(*in))
@ -6619,7 +6619,7 @@ func autoConvert_v1alpha3_VolumeSpec_To_kops_VolumeSpec(in *VolumeSpec, out *kop
out.DeleteOnTermination = in.DeleteOnTermination
out.Device = in.Device
out.Encrypted = in.Encrypted
out.Iops = in.Iops
out.IOPS = in.IOPS
out.Throughput = in.Throughput
out.Key = in.Key
out.Size = in.Size
@ -6636,7 +6636,7 @@ func autoConvert_kops_VolumeSpec_To_v1alpha3_VolumeSpec(in *kops.VolumeSpec, out
out.DeleteOnTermination = in.DeleteOnTermination
out.Device = in.Device
out.Encrypted = in.Encrypted
out.Iops = in.Iops
out.IOPS = in.IOPS
out.Throughput = in.Throughput
out.Key = in.Key
out.Size = in.Size

8
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -2142,8 +2142,8 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
*out = new(string)
**out = **in
}
if in.RootVolumeIops != nil {
in, out := &in.RootVolumeIops, &out.RootVolumeIops
if in.RootVolumeIOPS != nil {
in, out := &in.RootVolumeIOPS, &out.RootVolumeIOPS
*out = new(int32)
**out = **in
}
@ -4743,8 +4743,8 @@ func (in *VolumeSpec) DeepCopyInto(out *VolumeSpec) {
*out = new(bool)
**out = **in
}
if in.Iops != nil {
in, out := &in.Iops, &out.Iops
if in.IOPS != nil {
in, out := &in.IOPS, &out.IOPS
*out = new(int64)
**out = **in
}

4
pkg/apis/kops/validation/instancegroup.go
View File

@ -66,8 +66,8 @@ func ValidateInstanceGroup(g *kops.InstanceGroup, cloud fi.Cloud) field.ErrorLis
}
}
if fi.Int32Value(g.Spec.RootVolumeIops) < 0 {
allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "rootVolumeIops"), g.Spec.RootVolumeIops, "RootVolumeIops must be greater than 0"))
if fi.Int32Value(g.Spec.RootVolumeIOPS) < 0 {
allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "rootVolumeIops"), g.Spec.RootVolumeIOPS, "RootVolumeIOPS must be greater than 0"))
}
if fi.Int32Value(g.Spec.RootVolumeThroughput) < 0 {

2
pkg/apis/kops/validation/legacy.go
View File

@ -182,7 +182,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("nonMasqueradeCIDR"), "IPv6 clusters must have a nonMasqueradeCIDR of \"::/0\""))
}
if networkCIDR != nil && subnet.Overlap(nonMasqueradeCIDR, networkCIDR) && c.Spec.Networking != nil && c.Spec.Networking.AmazonVPC == nil && (c.Spec.Networking.Cilium == nil || c.Spec.Networking.Cilium.Ipam != kops.CiliumIpamEni) {
if networkCIDR != nil && subnet.Overlap(nonMasqueradeCIDR, networkCIDR) && c.Spec.Networking != nil && c.Spec.Networking.AmazonVPC == nil && (c.Spec.Networking.Cilium == nil || c.Spec.Networking.Cilium.IPAM != kops.CiliumIpamEni) {
allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("nonMasqueradeCIDR"), fmt.Sprintf("nonMasqueradeCIDR %q cannot overlap with networkCIDR %q", nonMasqueradeCIDRString, c.Spec.NetworkCIDR)))
}

6
pkg/apis/kops/validation/validation.go
View File

@ -926,11 +926,11 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
allErrs = append(allErrs, field.Forbidden(fldPath.Child("enableL7Proxy"), "Cilium L7 Proxy requires IPTablesRules to be installed."))
}
if v.Ipam != "" {
if v.IPAM != "" {
// "azure" not supported by kops
allErrs = append(allErrs, IsValidValue(fldPath.Child("ipam"), &v.Ipam, []string{"hostscope", "kubernetes", "crd", "eni"})...)
allErrs = append(allErrs, IsValidValue(fldPath.Child("ipam"), &v.IPAM, []string{"hostscope", "kubernetes", "crd", "eni"})...)
if v.Ipam == kops.CiliumIpamEni {
if v.IPAM == kops.CiliumIpamEni {
if c.CloudProvider != string(kops.CloudProviderAWS) {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("ipam"), "Cilum ENI IPAM is supported only in AWS"))
}

12
pkg/apis/kops/validation/validation_test.go
View File

@ -817,12 +817,12 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Ipam: "crd",
IPAM: "crd",
},
},
{
Cilium: kops.CiliumNetworkingSpec{
Ipam: "eni",
IPAM: "eni",
},
Spec: kops.ClusterSpec{
CloudProvider: "aws",
@ -831,7 +831,7 @@ func Test_Validate_Cilium(t *testing.T) {
{
Cilium: kops.CiliumNetworkingSpec{
DisableMasquerade: fi.Bool(true),
Ipam: "eni",
IPAM: "eni",
},
Spec: kops.ClusterSpec{
CloudProvider: "aws",
@ -839,14 +839,14 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Ipam: "foo",
IPAM: "foo",
},
ExpectedErrors: []string{"Unsupported value::cilium.ipam"},
},
{
Cilium: kops.CiliumNetworkingSpec{
DisableMasquerade: fi.Bool(false),
Ipam: "eni",
IPAM: "eni",
},
Spec: kops.ClusterSpec{
CloudProvider: "aws",
@ -865,7 +865,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Ipam: "eni",
IPAM: "eni",
},
Spec: kops.ClusterSpec{
CloudProvider: "gce",

8
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -2300,8 +2300,8 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
*out = new(string)
**out = **in
}
if in.RootVolumeIops != nil {
in, out := &in.RootVolumeIops, &out.RootVolumeIops
if in.RootVolumeIOPS != nil {
in, out := &in.RootVolumeIOPS, &out.RootVolumeIOPS
*out = new(int32)
**out = **in
}
@ -5029,8 +5029,8 @@ func (in *VolumeSpec) DeepCopyInto(out *VolumeSpec) {
*out = new(bool)
**out = **in
}
if in.Iops != nil {
in, out := &in.Iops, &out.Iops
if in.IOPS != nil {
in, out := &in.IOPS, &out.IOPS
*out = new(int64)
**out = **in
}

4
pkg/commands/set_cluster_test.go
View File

@ -195,7 +195,7 @@ func TestSetClusterFields(t *testing.T) {
Spec: kops.ClusterSpec{
Networking: &kops.NetworkingSpec{
Cilium: &kops.CiliumNetworkingSpec{
Ipam: "on",
IPAM: "on",
},
},
},
@ -317,7 +317,7 @@ func TestSetCiliumFields(t *testing.T) {
},
Networking: &kops.NetworkingSpec{
Cilium: &kops.CiliumNetworkingSpec{
Ipam: "eni",
IPAM: "eni",
EnableNodePort: true,
DisableMasquerade: fi.Bool(true),
},

4
pkg/commands/unset_cluster_test.go
View File

@ -245,7 +245,7 @@ func TestUnsetClusterFields(t *testing.T) {
Spec: kops.ClusterSpec{
Networking: &kops.NetworkingSpec{
Cilium: &kops.CiliumNetworkingSpec{
Ipam: "on",
IPAM: "on",
},
},
},
@ -399,7 +399,7 @@ func TestUnsetCiliumFields(t *testing.T) {
},
Networking: &kops.NetworkingSpec{
Cilium: &kops.CiliumNetworkingSpec{
Ipam: "eni",
IPAM: "eni",
EnableNodePort: true,
DisableMasquerade: fi.Bool(true),
},

18
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -186,7 +186,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
InstanceMonitoring: fi.Bool(false),
InstanceType: fi.String(strings.Split(ig.Spec.MachineType, ",")[0]),
IPv6AddressCount: fi.Int64(0),
RootVolumeIops: fi.Int64(int64(fi.Int32Value(ig.Spec.RootVolumeIops))),
RootVolumeIops: fi.Int64(int64(fi.Int32Value(ig.Spec.RootVolumeIOPS))),
RootVolumeOptimization: ig.Spec.RootVolumeOptimization,
RootVolumeSize: fi.Int64(int64(rootVolumeSize)),
RootVolumeType: fi.String(rootVolumeType),
@ -236,18 +236,18 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
x.Type = DefaultVolumeType
}
if x.Type == ec2.VolumeTypeIo1 || x.Type == ec2.VolumeTypeIo2 {
if x.Iops == nil {
x.Iops = fi.Int64(DefaultVolumeIonIops)
if x.IOPS == nil {
x.IOPS = fi.Int64(DefaultVolumeIonIops)
}
} else if x.Type == ec2.VolumeTypeGp3 {
if x.Iops == nil {
x.Iops = fi.Int64(DefaultVolumeGp3Iops)
if x.IOPS == nil {
x.IOPS = fi.Int64(DefaultVolumeGp3Iops)
}
if x.Throughput == nil {
x.Throughput = fi.Int64(DefaultVolumeGp3Throughput)
}
} else {
x.Iops = nil
x.IOPS = nil
}
deleteOnTermination := DefaultVolumeDeleteOnTermination
if x.DeleteOnTermination != nil {
@ -262,7 +262,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
EbsDeleteOnTermination: fi.Bool(deleteOnTermination),
EbsEncrypted: fi.Bool(encryption),
EbsKmsKey: x.Key,
EbsVolumeIops: x.Iops,
EbsVolumeIops: x.IOPS,
EbsVolumeSize: fi.Int64(x.Size),
EbsVolumeThroughput: x.Throughput,
EbsVolumeType: fi.String(x.Type),
@ -282,11 +282,11 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
}
if rootVolumeType == ec2.VolumeTypeIo1 || rootVolumeType == ec2.VolumeTypeIo2 {
if fi.Int32Value(ig.Spec.RootVolumeIops) < 100 {
if fi.Int32Value(ig.Spec.RootVolumeIOPS) < 100 {
lt.RootVolumeIops = fi.Int64(int64(DefaultVolumeIonIops))
}
} else if rootVolumeType == ec2.VolumeTypeGp3 {
if fi.Int32Value(ig.Spec.RootVolumeIops) < 3000 {
if fi.Int32Value(ig.Spec.RootVolumeIOPS) < 3000 {
lt.RootVolumeIops = fi.Int64(int64(DefaultVolumeGp3Iops))
}
if fi.Int32Value(ig.Spec.RootVolumeThroughput) < 125 {

2
pkg/model/awsmodel/spotinst.go
View File

@ -735,7 +735,7 @@ func (b *SpotInstanceGroupModelBuilder) buildRootVolumeOpts(ig *kops.InstanceGro
// IOPS.
{
iops := fi.Int32Value(ig.Spec.RootVolumeIops)
iops := fi.Int32Value(ig.Spec.RootVolumeIOPS)
if iops > 0 {
opts.IOPS = fi.Int64(int64(iops))
}

12
pkg/model/components/cilium.go
View File

@ -99,24 +99,24 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
c.SidecarIstioProxyImage = "cilium/istio_proxy"
}
if c.ToFqdnsDNSRejectResponseCode == "" {
c.ToFqdnsDNSRejectResponseCode = "refused"
if c.ToFQDNsDNSRejectResponseCode == "" {
c.ToFQDNsDNSRejectResponseCode = "refused"
}
if c.AgentPrometheusPort == 0 {
c.AgentPrometheusPort = wellknownports.CiliumPrometheusPort
}
if c.Ipam == "" {
c.Ipam = "kubernetes"
if c.IPAM == "" {
c.IPAM = "kubernetes"
}
if c.DisableMasquerade == nil {
c.DisableMasquerade = fi.Bool(c.Ipam == "eni")
c.DisableMasquerade = fi.Bool(c.IPAM == "eni")
}
if c.Tunnel == "" {
if c.Ipam == "eni" || clusterSpec.IsIPv6Only() {
if c.IPAM == "eni" || clusterSpec.IsIPv6Only() {
c.Tunnel = "disabled"
} else {
c.Tunnel = "vxlan"

4
pkg/model/iam/iam_builder.go
View File

@ -306,7 +306,7 @@ func (r *NodeRoleAPIServer) BuildAWSPolicy(b *PolicyBuilder) (*Policy, error) {
addAmazonVPCCNIPermissions(p, b.Partition)
}
if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Cilium != nil && b.Cluster.Spec.Networking.Cilium.Ipam == kops.CiliumIpamEni {
if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Cilium != nil && b.Cluster.Spec.Networking.Cilium.IPAM == kops.CiliumIpamEni {
addCiliumEniPermissions(p)
}
@ -377,7 +377,7 @@ func (r *NodeRoleMaster) BuildAWSPolicy(b *PolicyBuilder) (*Policy, error) {
addAmazonVPCCNIPermissions(p, b.Partition)
}
if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Cilium != nil && b.Cluster.Spec.Networking.Cilium.Ipam == kops.CiliumIpamEni {
if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Cilium != nil && b.Cluster.Spec.Networking.Cilium.IPAM == kops.CiliumIpamEni {
addCiliumEniPermissions(p)
}

4
tests/integration/conversion/minimal/v1alpha3.yaml
View File

@ -61,7 +61,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: nodes
spec:
associatePublicIp: true
associatePublicIP: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
@ -80,7 +80,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a
spec:
associatePublicIp: true
associatePublicIP: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1

8
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
View File

@ -114,7 +114,7 @@ data:
# DNS response code for rejecting DNS requests,
# available options are "nameError" and "refused"
tofqdns-dns-reject-response-code: "{{ .ToFqdnsDNSRejectResponseCode }}"
tofqdns-dns-reject-response-code: "{{ .ToFQDNsDNSRejectResponseCode }}"
# This option is disabled by default starting from version 1.4.x in favor
# of a more powerful DNS proxy-based implementation, see [0] for details.
# Enable this option if you want to use FQDN policies but do not want to use
@ -126,7 +126,7 @@ data:
#
# [0] http://docs.cilium.io/en/stable/policy/language/#dns-based
# [1] http://docs.cilium.io/en/stable/install/upgrade/#changes-that-may-require-action
tofqdns-enable-poller: "{{- if .ToFqdnsEnablePoller -}}true{{- else -}}false{{- end -}}"
tofqdns-enable-poller: "{{- if .ToFQDNsEnablePoller -}}true{{- else -}}false{{- end -}}"
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
wait-bpf-mount: "false"
# Enable fetching of container-runtime specific metadata
@ -157,7 +157,7 @@ data:
enable-node-port: "{{ .EnableNodePort }}"
kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}partial{{- end -}}"
enable-remote-node-identity: "{{ .EnableRemoteNodeIdentity -}}"
{{ with .Ipam }}
{{ with .IPAM }}
ipam: {{ . }}
{{ if eq . "eni" }}
enable-endpoint-routes: "true"
@ -834,7 +834,7 @@ spec:
type: Directory
{{- end }}
{{ if eq .Ipam "eni" }}
{{ if eq .IPAM "eni" }}
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:

6
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View File

@ -167,7 +167,7 @@ data:
# DNS response code for rejecting DNS requests,
# available options are "nameError" and "refused"
tofqdns-dns-reject-response-code: "{{ .ToFqdnsDNSRejectResponseCode }}"
tofqdns-dns-reject-response-code: "{{ .ToFQDNsDNSRejectResponseCode }}"
# This option is disabled by default starting from version 1.4.x in favor
# of a more powerful DNS proxy-based implementation, see [0] for details.
# Enable this option if you want to use FQDN policies but do not want to use
@ -179,7 +179,7 @@ data:
#
# [0] http://docs.cilium.io/en/stable/policy/language/#dns-based
# [1] http://docs.cilium.io/en/stable/install/upgrade/#changes-that-may-require-action
tofqdns-enable-poller: "{{- if .ToFqdnsEnablePoller -}}true{{- else -}}false{{- end -}}"
tofqdns-enable-poller: "{{- if .ToFQDNsEnablePoller -}}true{{- else -}}false{{- end -}}"
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
wait-bpf-mount: "false"
# Enable fetching of container-runtime specific metadata
@ -210,7 +210,7 @@ data:
enable-node-port: "{{ .EnableNodePort }}"
kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}partial{{- end -}}"
{{ with .Ipam }}
{{ with .IPAM }}
ipam: {{ . }}
{{ if eq . "eni" }}
enable-endpoint-routes: "true"

6
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
View File

@ -185,7 +185,7 @@ data:
# DNS response code for rejecting DNS requests,
# available options are "nameError" and "refused"
tofqdns-dns-reject-response-code: "{{ .ToFqdnsDNSRejectResponseCode }}"
tofqdns-dns-reject-response-code: "{{ .ToFQDNsDNSRejectResponseCode }}"
# This option is disabled by default starting from version 1.4.x in favor
# of a more powerful DNS proxy-based implementation, see [0] for details.
# Enable this option if you want to use FQDN policies but do not want to use
@ -197,7 +197,7 @@ data:
#
# [0] http://docs.cilium.io/en/stable/policy/language/#dns-based
# [1] http://docs.cilium.io/en/stable/install/upgrade/#changes-that-may-require-action
tofqdns-enable-poller: "{{- if .ToFqdnsEnablePoller -}}true{{- else -}}false{{- end -}}"
tofqdns-enable-poller: "{{- if .ToFQDNsEnablePoller -}}true{{- else -}}false{{- end -}}"
{{- if not (semverCompare ">=1.10.4 || ~1.9.10" $semver) }}
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
wait-bpf-mount: "false"
@ -231,7 +231,7 @@ data:
enable-node-port: "{{ .EnableNodePort }}"
kube-proxy-replacement: "{{- if .EnableNodePort -}}strict{{- else -}}partial{{- end -}}"
{{ with .Ipam }}
{{ with .IPAM }}
ipam: {{ . }}
{{ if eq . "eni" }}
enable-endpoint-routes: "true"

2
upup/pkg/fi/clientset_castore.go
View File

@ -126,7 +126,7 @@ func FindPrimary(keyset *kops.Keyset) *kops.KeysetItem {
var primary *kops.KeysetItem
var primaryVersion *big.Int
primaryId := keyset.Spec.PrimaryId
primaryId := keyset.Spec.PrimaryID
for i := range keyset.Spec.Keys {
item := &keyset.Spec.Keys[i]

2
upup/pkg/fi/cloudup/aliup/status.go
View File

@ -127,7 +127,7 @@ func findEtcdStatus(c ALICloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
memberName := etcdClusterSpec.NodeName
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: memberName,
VolumeId: disk.DiskId,
VolumeID: disk.DiskId,
})
}

2
upup/pkg/fi/cloudup/awsup/status.go
View File

@ -109,7 +109,7 @@ func findEtcdStatus(c AWSCloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
memberName := etcdClusterSpec.NodeName
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: memberName,
VolumeId: aws.StringValue(volume.VolumeId),
VolumeID: aws.StringValue(volume.VolumeId),
})
}

2
upup/pkg/fi/cloudup/azure/status.go
View File

@ -90,7 +90,7 @@ func (c *azureCloudImplementation) findEtcdStatus(disks []compute.Disk) ([]kops.
}
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: etcdClusterSpec.NodeName,
VolumeId: *disk.Name,
VolumeID: *disk.Name,
})
}

6
upup/pkg/fi/cloudup/azure/status_test.go
View File

@ -127,15 +127,15 @@ func TestFindEtcdStatus(t *testing.T) {
expected := map[string]*kops.EtcdMemberStatus{
"a": {
Name: "a",
VolumeId: "d0",
VolumeID: "d0",
},
"b": {
Name: "b",
VolumeId: "d1",
VolumeID: "d1",
},
"c": {
Name: "c",
VolumeId: "d2",
VolumeID: "d2",
},
}

2
upup/pkg/fi/cloudup/do/cloud.go
View File

@ -320,7 +320,7 @@ func findEtcdStatus(c *doCloudImplementation, cluster *kops.Cluster) ([]kops.Etc
memberName := etcdClusterSpec.NodeName
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: memberName,
VolumeId: volume.ID,
VolumeID: volume.ID,
})
}
}

2
upup/pkg/fi/cloudup/gce/status.go
View File

@ -131,7 +131,7 @@ func (c *gceCloudImplementation) findEtcdStatus(cluster *kops.Cluster) ([]kops.E
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: etcdClusterSpec.NodeName,
VolumeId: disk.Name,
VolumeID: disk.Name,
})
}

2
upup/pkg/fi/cloudup/openstack/status.go
View File

@ -103,7 +103,7 @@ func findEtcdStatus(c OpenstackCloud, cluster *kops.Cluster) ([]kops.EtcdCluster
memberName := etcdClusterSpec.NodeName
status.Members = append(status.Members, &kops.EtcdMemberStatus{
Name: memberName,
VolumeId: volume.ID,
VolumeID: volume.ID,
})
}
var status []kops.EtcdClusterStatus

2
upup/pkg/fi/vfs_castore.go
View File

@ -166,7 +166,7 @@ func (k *Keyset) ToAPIObject(name string) (*kops.Keyset, error) {
o.Spec.Keys = append(o.Spec.Keys, oki)
}
if k.Primary != nil {
o.Spec.PrimaryId = k.Primary.Id
o.Spec.PrimaryID = k.Primary.Id
}
return o, nil
}