Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing priorityClassName to addons #8752

Merged
merged 2 commits into from
Mar 19, 2020
Merged

Add missing priorityClassName to addons #8752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ccaa1
Add missing priorityClassName to addons
johngmyers Mar 15, 2020
09df6ac
Remove unreferenced template
johngmyers Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions upup/models/cloudup/resources/addons/core.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ spec:
spec:
nodeSelector:
node-role.kubernetes.io/master: ""
priorityClassName: system-node-critical
serviceAccountName: cloud-controller-manager
containers:
- name: cloud-controller-manager
Expand Down
230 changes: 0 additions & 230 deletions upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ spec:
name: bpf-maps
- mountPath: /var/run/cilium
name: cilium-run
priorityClassName: system-cluster-critical
priorityClassName: system-node-critical
restartPolicy: Always
serviceAccount: cilium
serviceAccountName: cilium
Expand Down Expand Up @@ -748,6 +748,7 @@ spec:
readOnly: true
{{- end }}
hostNetwork: true
priorityClassName: system-cluster-critical
restartPolicy: Always
serviceAccount: cilium-operator
serviceAccountName: cilium-operator
Expand Down Expand Up @@ -931,6 +932,7 @@ spec:
name: cilium-etcd-operator
dnsPolicy: ClusterFirst
hostNetwork: true
priorityClassName: system-cluster-critical
restartPolicy: Always
serviceAccount: cilium-etcd-operator
serviceAccountName: cilium-etcd-operator
Expand Down
5 changes: 5 additions & 0 deletions upup/models/cloudup/resources/addons/networking.romana/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
hostNetwork: true
priorityClassName: system-cluster-critical
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
Expand Down Expand Up @@ -172,6 +173,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
hostNetwork: true
priorityClassName: system-cluster-critical
serviceAccountName: romana-listener
tolerations:
- key: node-role.kubernetes.io/master
Expand Down Expand Up @@ -206,6 +208,7 @@ spec:
romana-app: agent
spec:
hostNetwork: true
priorityClassName: system-node-critical
securityContext:
seLinuxOptions:
type: spc_t
Expand Down Expand Up @@ -319,6 +322,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
hostNetwork: true
priorityClassName: system-cluster-critical
serviceAccountName: romana-aws
tolerations:
- key: node-role.kubernetes.io/master
Expand Down Expand Up @@ -354,6 +358,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
hostNetwork: true
priorityClassName: system-cluster-critical
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

if b.cluster.Spec.Networking.Romana != nil {
key := "networking.romana"
version := "v2.0.2-kops.2"
version := "v2.0.2-kops.3"

{
location := key + "/k8s-1.7.yaml"
Expand Down Expand Up @@ -1106,7 +1106,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

{
key := "core.addons.k8s.io"
version := "1.12.0"
version := "1.12.1-kops.1"

location := key + "/k8s-1.12.yaml"
id := "k8s-1.12-ccm"
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: ecb28739c283287eacd9863f1d057e5b09fabb1a
manifestHash: e70d13053043ca311108cd90521f30d75c558cc7
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
Expand Down