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

Change description of NPCExtraArgs in response to PR Feedback. Drop support for K8S 1.7

This commit is contained in:
Reilly Brogan 2020-01-15 15:06:03 -06:00
parent a2473156ae
commit f5ce3f674b
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2788,7 +2788,8 @@ spec:
format: int32 format: int32
type: integer type: integer
netExtraArgs: netExtraArgs:
description: Extra arguments that are passed to weave-kube description: NetExtraArgs are extra arguments that are passed
to weave-kube.
type: string type: string
noMasqLocal: noMasqLocal:
format: int32 format: int32
@ -2801,7 +2802,8 @@ spec:
Default 50m Default 50m
type: string type: string
npcExtraArgs: npcExtraArgs:
description: Extra arguments that are passed to weave-npc description: NPCExtraArgs are extra arguments that are passed
to weave-npc.
type: string type: string
npcMemoryLimit: npcMemoryLimit:
description: NPCMemoryLimit memory limit of weave npc container. description: NPCMemoryLimit memory limit of weave npc container.

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

@ -75,7 +75,7 @@ type WeaveNetworkingSpec struct {
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"` MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
// CPULimit CPU limit of weave container. // CPULimit CPU limit of weave container.
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"` CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// Extra arguments that are passed to weave-kube // NetExtraArgs are extra arguments that are passed to weave-kube.
NetExtraArgs string `json:"netExtraArgs,omitempty"` NetExtraArgs string `json:"netExtraArgs,omitempty"`
// NPCMemoryRequest memory request of weave npc container. Default 200Mi // NPCMemoryRequest memory request of weave npc container. Default 200Mi
@ -86,7 +86,7 @@ type WeaveNetworkingSpec struct {
NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"` NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"`
// NPCCPULimit CPU limit of weave npc container // NPCCPULimit CPU limit of weave npc container
NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"` NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
// Extra arguments that are passed to weave-npc // NPCExtraArgs are extra arguments that are passed to weave-npc.
NPCExtraArgs string `json:"npcExtraArgs,omitempty"` NPCExtraArgs string `json:"npcExtraArgs,omitempty"`
} }

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

@ -75,7 +75,7 @@ type WeaveNetworkingSpec struct {
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"` MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
// CPULimit CPU limit of weave container. // CPULimit CPU limit of weave container.
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"` CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// Extra arguments that are passed to weave-kube // NetExtraArgs are extra arguments that are passed to weave-kube.
NetExtraArgs string `json:"netExtraArgs,omitempty"` NetExtraArgs string `json:"netExtraArgs,omitempty"`
// NPCMemoryRequest memory request of weave npc container. Default 200Mi // NPCMemoryRequest memory request of weave npc container. Default 200Mi
@ -86,7 +86,7 @@ type WeaveNetworkingSpec struct {
NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"` NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"`
// NPCCPULimit CPU limit of weave npc container // NPCCPULimit CPU limit of weave npc container
NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"` NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
// Extra arguments that are passed to weave-npc // NPCExtraArgs are extra arguments that are passed to weave-npc.
NPCExtraArgs string `json:"npcExtraArgs,omitempty"` NPCExtraArgs string `json:"npcExtraArgs,omitempty"`
} }

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

@ -75,7 +75,7 @@ type WeaveNetworkingSpec struct {
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"` MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
// CPULimit CPU limit of weave container. // CPULimit CPU limit of weave container.
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"` CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// Extra arguments that are passed to weave-kube // NetExtraArgs are extra arguments that are passed to weave-kube.
NetExtraArgs string `json:"netExtraArgs,omitempty"` NetExtraArgs string `json:"netExtraArgs,omitempty"`
// NPCMemoryRequest memory request of weave npc container. Default 200Mi // NPCMemoryRequest memory request of weave npc container. Default 200Mi
@ -86,7 +86,7 @@ type WeaveNetworkingSpec struct {
NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"` NPCMemoryLimit *resource.Quantity `json:"npcMemoryLimit,omitempty"`
// NPCCPULimit CPU limit of weave npc container // NPCCPULimit CPU limit of weave npc container
NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"` NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
// Extra arguments that are passed to weave-npc // NPCExtraArgs are extra arguments that are passed to weave-npc.
NPCExtraArgs string `json:"npcExtraArgs,omitempty"` NPCExtraArgs string `json:"npcExtraArgs,omitempty"`
} }

4
upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
View File

@ -203,10 +203,6 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
{{- if .Networking.Weave.NPCExtraArgs }}
- name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }}
image: 'weaveworks/weave-npc:2.6.0' image: 'weaveworks/weave-npc:2.6.0'
ports: ports:
- name: metrics - name: metrics

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

@ -131,7 +131,7 @@ spec:
- id: k8s-1.7 - id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.8.0' kubernetesVersion: '>=1.7.0 <1.8.0'
manifest: networking.weave/k8s-1.7.yaml manifest: networking.weave/k8s-1.7.yaml
manifestHash: 0725cf9a9f3651209a0b726ed00a078d7fb2e7f6 manifestHash: 990772f9809ffb0cff4ea9341a9ab7e9094d7587
name: networking.weave name: networking.weave
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"