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

Standardize labels with k8s-app #3154

Closed
wants to merge 1 commit into from
Closed

Standardize labels with k8s-app #3154

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
4 changes: 2 additions & 2 deletions roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
labels:
app: netchecker-agent
k8s-app: netchecker-agent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app.kubernetes.io/name

name: netchecker-agent
namespace: {{ netcheck_namespace }}
spec:
template:
metadata:
name: netchecker-agent
labels:
app: netchecker-agent
k8s-app: netchecker-agent
spec:
tolerations:
- effect: NoSchedule
Expand Down
4 changes: 2 additions & 2 deletions roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
labels:
app: netchecker-agent-hostnet
k8s-app: netchecker-agent-hostnet
name: netchecker-agent-hostnet
namespace: {{ netcheck_namespace }}
spec:
template:
metadata:
name: netchecker-agent-hostnet
labels:
app: netchecker-agent-hostnet
k8s-app: netchecker-agent-hostnet
spec:
hostNetwork: True
{% if kube_version | version_compare('v1.6', '>=') %}
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ansible/templates/netchecker-server-deployment.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
metadata:
name: netchecker-server
labels:
app: netchecker-server
k8s-app: netchecker-server
namespace: {{ netcheck_namespace }}
spec:
containers:
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ansible/templates/netchecker-server-svc.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: {{ netcheck_namespace }}
spec:
selector:
app: netchecker-server
k8s-app: netchecker-server
ports:
-
protocol: TCP
Expand Down
6 changes: 3 additions & 3 deletions ...s-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ metadata:
name: cephfs-provisioner
namespace: {{ cephfs_provisioner_namespace }}
labels:
app: cephfs-provisioner
k8s-app: cephfs-provisioner
version: {{ cephfs_provisioner_image_tag }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app.kubernetes.io/name
app.kubernetes.io/version

spec:
replicas: 1
selector:
matchLabels:
app: cephfs-provisioner
k8s-app: cephfs-provisioner
version: {{ cephfs_provisioner_image_tag }}
template:
metadata:
labels:
app: cephfs-provisioner
k8s-app: cephfs-provisioner
version: {{ cephfs_provisioner_image_tag }}
spec:
serviceAccount: cephfs-provisioner
Expand Down
2 changes: 1 addition & 1 deletion ...kubernetes-apps/ingress_controller/cert_manager/templates/clusterrole-cert-manager.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: ClusterRole
metadata:
name: cert-manager
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is there 'tiller' label when it's not deployed via tiller ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same note for chart and release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy & Past from official manifest example for simplify integration overhead (i.e. lesser result during diff):

Expand Down
2 changes: 1 addition & 1 deletion ...tes-apps/ingress_controller/cert_manager/templates/clusterrolebinding-cert-manager.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: ClusterRoleBinding
metadata:
name: cert-manager
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-certificate.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
name: certificates.certmanager.k8s.io
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-clusterissuer.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
name: clusterissuers.certmanager.k8s.io
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-issuer.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
name: issuers.certmanager.k8s.io
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
Expand Down
6 changes: 3 additions & 3 deletions roles/kubernetes-apps/ingress_controller/cert_manager/templates/deploy-cert-manager.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ metadata:
name: cert-manager
namespace: {{ cert_manager_namespace }}
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
spec:
replicas: 1
selector:
matchLabels:
app: cert-manager
k8s-app: cert-manager
release: cert-manager
template:
metadata:
labels:
app: cert-manager
k8s-app: cert-manager
release: cert-manager
annotations:
spec:
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/ingress_controller/cert_manager/templates/sa-cert-manager.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: cert-manager
namespace: {{ cert_manager_namespace }}
labels:
app: cert-manager
k8s-app: cert-manager
chart: cert-manager-v0.4.1
release: cert-manager
heritage: Tiller
2 changes: 1 addition & 1 deletion roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: "kube-system"
labels:
tier: node
app: flannel
k8s-app: flannel
data:
cni-conf.json: |
{
Expand Down