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

Add default tags to LB controller and cilium eni resources #11517

Merged
merged 1 commit into from
May 19, 2021
Merged

Add default tags to LB controller and cilium eni resources #11517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ spec:
- --endpoint=$(CSI_ENDPOINT)
- --logtostderr
- --k8s-tag-cluster-id={{ ClusterName }}
- --extra-tags={{ CsiExtraTags }}
- "--extra-tags={{ CloudLabels }}"
- --v=5
env:
- name: CSI_ENDPOINT
Expand Down
1 change: 1 addition & 0 deletions ...cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.9.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ spec:
- --enable-wafv2=false
- --enable-shield=false
- --ingress-class=alb
- "--default-tags={{ CloudLabels }}"
image: amazon/aws-alb-ingress-controller:{{ or .AWSLoadBalancerController.Version "v2.2.0" }}
livenessProbe:
failureThreshold: 2
Expand Down
5 changes: 3 additions & 2 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,8 +817,9 @@ spec:
spec:
containers:
- args:
- --config-dir=/tmp/cilium/config-map
- --debug=$(CILIUM_DEBUG)
- "--config-dir=/tmp/cilium/config-map"
- "--debug=$(CILIUM_DEBUG)"
- "--eni-tags={{ CloudLabels }}"
command:
- cilium-operator
env:
Expand Down
5 changes: 3 additions & 2 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,9 @@ spec:
spec:
containers:
- args:
- --config-dir=/tmp/cilium/config-map
- --debug=$(CILIUM_DEBUG)
- "--config-dir=/tmp/cilium/config-map"
- "--debug=$(CILIUM_DEBUG)"
- "--eni-tags={{ CloudLabels }}"
command:
- cilium-operator
env:
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/template_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
dest["WeaveSecret"] = func() string { return weavesecretString }
}

dest["CsiExtraTags"] = func() string {
dest["CloudLabels"] = func() string {
labels := []string{
fmt.Sprintf("KubernetesCluster=%s", cluster.ObjectMeta.Name),
}
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 @@ -61,7 +61,7 @@ spec:
version: 1.17.0
- id: k8s-1.12
manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
manifestHash: 7de4d6e933cda022172f7e38ecf510c20a89c81a
manifestHash: 368ab627c5fb9087ad60df6bf4fe5dc29c017f79
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down