From 449cb34cfbe3bc2c673ecf634eb81a498fa5ade1 Mon Sep 17 00:00:00 2001 From: Romain GERARD Date: Wed, 17 Nov 2021 09:51:50 +0100 Subject: [PATCH] Revert "Add name in ports service & remove ownerId (#484)" This reverts commit 32107f8449127e81783685f193e67170a2859b67. --- lib/aws/charts/q-application/templates/deployment.j2.yaml | 4 +++- .../charts/q-application/templates/networkpolicies.j2.yaml | 7 +++++++ lib/aws/charts/q-application/templates/pdb.j2.yaml | 2 ++ lib/aws/charts/q-application/templates/secret.j2.yaml | 1 + lib/aws/charts/q-application/templates/service.j2.yaml | 3 ++- lib/aws/charts/q-application/templates/statefulset.j2.yaml | 6 +++++- .../charts/q-application/templates/deployment.j2.yaml | 4 +++- .../charts/q-application/templates/pdb.j2.yaml | 2 ++ .../charts/q-application/templates/secret.j2.yaml | 1 + .../charts/q-application/templates/service.j2.yaml | 3 ++- .../charts/q-application/templates/statefulset.j2.yaml | 6 +++++- .../charts/q-application/templates/deployment.j2.yaml | 4 +++- .../charts/q-application/templates/networkpolicies.j2.yaml | 5 +++++ lib/scaleway/charts/q-application/templates/pdb.j2.yaml | 2 ++ lib/scaleway/charts/q-application/templates/secret.j2.yaml | 1 + .../charts/q-application/templates/service.j2.yaml | 3 ++- .../charts/q-application/templates/statefulset.j2.yaml | 6 +++++- 17 files changed, 51 insertions(+), 9 deletions(-) diff --git a/lib/aws/charts/q-application/templates/deployment.j2.yaml b/lib/aws/charts/q-application/templates/deployment.j2.yaml index 3f3689ed..e4697fd1 100644 --- a/lib/aws/charts/q-application/templates/deployment.j2.yaml +++ b/lib/aws/charts/q-application/templates/deployment.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -21,12 +22,14 @@ spec: {% endif %} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -64,7 +67,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: diff --git a/lib/aws/charts/q-application/templates/networkpolicies.j2.yaml b/lib/aws/charts/q-application/templates/networkpolicies.j2.yaml index 58e077f7..14ab70f4 100644 --- a/lib/aws/charts/q-application/templates/networkpolicies.j2.yaml +++ b/lib/aws/charts/q-application/templates/networkpolicies.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }}-default namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -14,6 +15,7 @@ spec: matchLabels: appId: {{ id }} app: {{ sanitized_name }} + ownerId: {{ owner_id }} envId: {{ environment_id }} policyTypes: - Ingress @@ -24,6 +26,7 @@ metadata: name: {{ sanitized_name }}-app-access namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -33,12 +36,14 @@ spec: matchLabels: appId: {{ id }} app: {{ sanitized_name }} + ownerId: {{ owner_id }} envId: {{ environment_id }} ingress: # Allow ingress from same environment - from: - podSelector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} # Allow ingress from everywhere but only to application port @@ -71,6 +76,7 @@ metadata: name: {{ sanitized_name }}-deny-aws-metadata-server namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -79,6 +85,7 @@ spec: matchLabels: appId: {{ id }} app: {{ sanitized_name }} + ownerId: {{ owner_id }} envId: {{ environment_id }} egress: - to: diff --git a/lib/aws/charts/q-application/templates/pdb.j2.yaml b/lib/aws/charts/q-application/templates/pdb.j2.yaml index 5e5c46b7..539eb51e 100644 --- a/lib/aws/charts/q-application/templates/pdb.j2.yaml +++ b/lib/aws/charts/q-application/templates/pdb.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -13,6 +14,7 @@ spec: minAvailable: 1 selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/aws/charts/q-application/templates/secret.j2.yaml b/lib/aws/charts/q-application/templates/secret.j2.yaml index 664ded95..86625f6e 100644 --- a/lib/aws/charts/q-application/templates/secret.j2.yaml +++ b/lib/aws/charts/q-application/templates/secret.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/aws/charts/q-application/templates/service.j2.yaml b/lib/aws/charts/q-application/templates/service.j2.yaml index be5417e2..28467236 100644 --- a/lib/aws/charts/q-application/templates/service.j2.yaml +++ b/lib/aws/charts/q-application/templates/service.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -12,10 +13,10 @@ spec: type: ClusterIP ports: - protocol: TCP - name: "p{{ private_port }}" port: {{ private_port }} targetPort: {{ private_port }} selector: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} diff --git a/lib/aws/charts/q-application/templates/statefulset.j2.yaml b/lib/aws/charts/q-application/templates/statefulset.j2.yaml index 3c253b39..7beb90f4 100644 --- a/lib/aws/charts/q-application/templates/statefulset.j2.yaml +++ b/lib/aws/charts/q-application/templates/statefulset.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -16,12 +17,14 @@ spec: serviceName: {{ sanitized_name }} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -59,7 +62,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: @@ -90,6 +92,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -109,6 +112,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} diskId: {{ s.id }} diff --git a/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml b/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml index 3f3689ed..e4697fd1 100644 --- a/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml +++ b/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -21,12 +22,14 @@ spec: {% endif %} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -64,7 +67,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: diff --git a/lib/digitalocean/charts/q-application/templates/pdb.j2.yaml b/lib/digitalocean/charts/q-application/templates/pdb.j2.yaml index 5e5c46b7..539eb51e 100644 --- a/lib/digitalocean/charts/q-application/templates/pdb.j2.yaml +++ b/lib/digitalocean/charts/q-application/templates/pdb.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -13,6 +14,7 @@ spec: minAvailable: 1 selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/digitalocean/charts/q-application/templates/secret.j2.yaml b/lib/digitalocean/charts/q-application/templates/secret.j2.yaml index 664ded95..86625f6e 100644 --- a/lib/digitalocean/charts/q-application/templates/secret.j2.yaml +++ b/lib/digitalocean/charts/q-application/templates/secret.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/digitalocean/charts/q-application/templates/service.j2.yaml b/lib/digitalocean/charts/q-application/templates/service.j2.yaml index be5417e2..28467236 100644 --- a/lib/digitalocean/charts/q-application/templates/service.j2.yaml +++ b/lib/digitalocean/charts/q-application/templates/service.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -12,10 +13,10 @@ spec: type: ClusterIP ports: - protocol: TCP - name: "p{{ private_port }}" port: {{ private_port }} targetPort: {{ private_port }} selector: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} diff --git a/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml b/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml index aca67c30..5055d38c 100644 --- a/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml +++ b/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -16,12 +17,14 @@ spec: serviceName: {{ sanitized_name }} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -59,7 +62,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: @@ -90,6 +92,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -109,6 +112,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} diskId: {{ s.id }} diff --git a/lib/scaleway/charts/q-application/templates/deployment.j2.yaml b/lib/scaleway/charts/q-application/templates/deployment.j2.yaml index 008e4d9f..0267177f 100644 --- a/lib/scaleway/charts/q-application/templates/deployment.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/deployment.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -21,11 +22,13 @@ spec: {% endif %} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -63,7 +66,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: diff --git a/lib/scaleway/charts/q-application/templates/networkpolicies.j2.yaml b/lib/scaleway/charts/q-application/templates/networkpolicies.j2.yaml index 09290d63..01e5a43f 100644 --- a/lib/scaleway/charts/q-application/templates/networkpolicies.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/networkpolicies.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }}-default namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -14,6 +15,7 @@ spec: matchLabels: appId: {{ id }} app: {{ sanitized_name }} + ownerId: {{ owner_id }} envId: {{ environment_id }} policyTypes: - Ingress @@ -24,6 +26,7 @@ metadata: name: {{ sanitized_name }}-app-access namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -33,12 +36,14 @@ spec: matchLabels: appId: {{ id }} app: {{ sanitized_name }} + ownerId: {{ owner_id }} envId: {{ environment_id }} ingress: # Allow ingress from same environment - from: - podSelector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} # Allow ingress from everywhere but only to application port diff --git a/lib/scaleway/charts/q-application/templates/pdb.j2.yaml b/lib/scaleway/charts/q-application/templates/pdb.j2.yaml index 5e5c46b7..539eb51e 100644 --- a/lib/scaleway/charts/q-application/templates/pdb.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/pdb.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -13,6 +14,7 @@ spec: minAvailable: 1 selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/scaleway/charts/q-application/templates/secret.j2.yaml b/lib/scaleway/charts/q-application/templates/secret.j2.yaml index 109d9882..1e78760f 100644 --- a/lib/scaleway/charts/q-application/templates/secret.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/secret.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} diff --git a/lib/scaleway/charts/q-application/templates/service.j2.yaml b/lib/scaleway/charts/q-application/templates/service.j2.yaml index be5417e2..28467236 100644 --- a/lib/scaleway/charts/q-application/templates/service.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/service.j2.yaml @@ -5,6 +5,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} @@ -12,10 +13,10 @@ spec: type: ClusterIP ports: - protocol: TCP - name: "p{{ private_port }}" port: {{ private_port }} targetPort: {{ private_port }} selector: + ownerId: {{ owner_id }} appId: {{ id }} app: {{ sanitized_name }} envId: {{ environment_id }} diff --git a/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml b/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml index 98d9cced..7ade4d7b 100644 --- a/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml +++ b/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml @@ -6,6 +6,7 @@ metadata: name: {{ sanitized_name }} namespace: {{ namespace }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -16,12 +17,14 @@ spec: serviceName: {{ sanitized_name }} selector: matchLabels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} template: metadata: labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -59,7 +62,6 @@ spec: {%- if private_port %} ports: - containerPort: {{ private_port }} - name: "p{{ private_port }}" protocol: TCP readinessProbe: tcpSocket: @@ -90,6 +92,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} app: {{ sanitized_name }} @@ -109,6 +112,7 @@ spec: - metadata: name: {{ s.id }} labels: + ownerId: {{ owner_id }} envId: {{ environment_id }} appId: {{ id }} diskId: {{ s.id }}