diff --git a/src/index.ts b/src/index.ts index 44cbf85..0d2a895 100644 --- a/src/index.ts +++ b/src/index.ts @@ -130,7 +130,7 @@ export class Redis extends Construct { metadata: { name: name, labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, type: 'Opaque', @@ -143,7 +143,7 @@ export class Redis extends Construct { metadata: { name: `${name}-default`, labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, data: { @@ -155,7 +155,7 @@ export class Redis extends Construct { metadata: { name: `${name}-scripts`, labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, data: { @@ -211,7 +211,7 @@ export class Redis extends Construct { metadata: { name: `${name}-headless`, labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, spec: { @@ -231,7 +231,7 @@ export class Redis extends Construct { }, ], selector: { - 'app.kubernetes.io/name': name, + app: name, }, }, }); @@ -240,7 +240,7 @@ export class Redis extends Construct { metadata: { name: name, labels: { - 'app.kubernetes.io/name': name, + app: name, }, annotations: undefined, }, @@ -253,7 +253,7 @@ export class Redis extends Construct { protocol: 'TCP', }], selector: { - 'app.kubernetes.io/name': name, + app: name, }, }, }); @@ -262,7 +262,7 @@ export class Redis extends Construct { metadata: { name: name, labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, spec: { @@ -274,7 +274,7 @@ export class Redis extends Construct { }, selector: { matchLabels: { - 'app.kubernetes.io/name': name, + app: name, }, }, replicas: replicas, @@ -282,12 +282,14 @@ export class Redis extends Construct { podManagementPolicy: 'Parallel', template: { metadata: { - labels: opts?.kumaMesh && opts?.kumaMeshName ? { + annotations: opts?.kumaMesh && opts?.kumaMeshName ? { 'kuma.io/sidecar-injection': 'enabled', - 'app.kubernetes.io/name': name, 'kuma.io/mesh': opts?.kumaMeshName, } : { - 'app.kubernetes.io/name': name, + 'kuma.io/sidecar-injection': 'disabled', + }, + labels: { + app: name, }, }, spec: { @@ -303,7 +305,7 @@ export class Redis extends Construct { podAffinityTerm: { labelSelector: { matchLabels: { - 'app.kubernetes.io/name': name, + app: name, }, }, namespaces: [ns], @@ -469,7 +471,7 @@ export class Redis extends Construct { metadata: { name: 'redis-data', labels: { - 'app.kubernetes.io/name': name, + app: name, }, }, spec: { diff --git a/test/__snapshots__/hello.test.ts.snap b/test/__snapshots__/hello.test.ts.snap index 8dbe0ef..ba66237 100644 --- a/test/__snapshots__/hello.test.ts.snap +++ b/test/__snapshots__/hello.test.ts.snap @@ -24,7 +24,7 @@ Array [ "kind": "Secret", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis", "namespace": "test", @@ -1850,7 +1850,7 @@ Array [ "kind": "ConfigMap", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis-default", "namespace": "test", @@ -1894,7 +1894,7 @@ Array [ "kind": "ConfigMap", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis-scripts", "namespace": "test", @@ -1905,7 +1905,7 @@ Array [ "kind": "Service", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis-headless", "namespace": "test", @@ -1926,7 +1926,7 @@ Array [ ], "publishNotReadyAddresses": true, "selector": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "type": "ClusterIP", }, @@ -1936,7 +1936,7 @@ Array [ "kind": "Service", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis", "namespace": "test", @@ -1951,7 +1951,7 @@ Array [ }, ], "selector": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "type": "ClusterIP", }, @@ -1961,7 +1961,7 @@ Array [ "kind": "StatefulSet", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "asd-redis", "namespace": "test", @@ -1971,14 +1971,17 @@ Array [ "replicas": 3, "selector": Object { "matchLabels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, }, "serviceName": "asd-redis-headless", "template": Object { "metadata": Object { + "annotations": Object { + "kuma.io/sidecar-injection": "disabled", + }, "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, }, "spec": Object { @@ -1989,7 +1992,7 @@ Array [ "podAffinityTerm": Object { "labelSelector": Object { "matchLabels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, }, "namespaces": Array [ @@ -2171,7 +2174,7 @@ Array [ Object { "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asd-redis", + "app": "asd-redis", }, "name": "redis-data", }, @@ -2217,7 +2220,7 @@ Array [ "kind": "Secret", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis", "namespace": "test", @@ -4043,7 +4046,7 @@ Array [ "kind": "ConfigMap", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis-default", "namespace": "test", @@ -4087,7 +4090,7 @@ Array [ "kind": "ConfigMap", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis-scripts", "namespace": "test", @@ -4098,7 +4101,7 @@ Array [ "kind": "Service", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis-headless", "namespace": "test", @@ -4119,7 +4122,7 @@ Array [ ], "publishNotReadyAddresses": true, "selector": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "type": "ClusterIP", }, @@ -4129,7 +4132,7 @@ Array [ "kind": "Service", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis", "namespace": "test", @@ -4144,7 +4147,7 @@ Array [ }, ], "selector": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "type": "ClusterIP", }, @@ -4154,7 +4157,7 @@ Array [ "kind": "StatefulSet", "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "asdasd-redis", "namespace": "test", @@ -4164,17 +4167,19 @@ Array [ "replicas": 2, "selector": Object { "matchLabels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, }, "serviceName": "asdasd-redis-headless", "template": Object { "metadata": Object { - "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "annotations": Object { "kuma.io/mesh": "test-mesh", "kuma.io/sidecar-injection": "enabled", }, + "labels": Object { + "app": "asdasd-redis", + }, }, "spec": Object { "affinity": Object { @@ -4184,7 +4189,7 @@ Array [ "podAffinityTerm": Object { "labelSelector": Object { "matchLabels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, }, "namespaces": Array [ @@ -4378,7 +4383,7 @@ Array [ Object { "metadata": Object { "labels": Object { - "app.kubernetes.io/name": "asdasd-redis", + "app": "asdasd-redis", }, "name": "redis-data", },