Skip to content

Commit

Permalink
fix(kuma): add annotation instead of labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Hunter Thompson committed Dec 17, 2021
1 parent 1c2c68d commit e1abfb8
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 39 deletions.
30 changes: 16 additions & 14 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export class Redis extends Construct {
metadata: {
name: name,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
type: 'Opaque',
Expand All @@ -143,7 +143,7 @@ export class Redis extends Construct {
metadata: {
name: `${name}-default`,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
data: {
Expand All @@ -155,7 +155,7 @@ export class Redis extends Construct {
metadata: {
name: `${name}-scripts`,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
data: {
Expand Down Expand Up @@ -211,7 +211,7 @@ export class Redis extends Construct {
metadata: {
name: `${name}-headless`,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
spec: {
Expand All @@ -231,7 +231,7 @@ export class Redis extends Construct {
},
],
selector: {
'app.kubernetes.io/name': name,
app: name,
},
},
});
Expand All @@ -240,7 +240,7 @@ export class Redis extends Construct {
metadata: {
name: name,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
annotations: undefined,
},
Expand All @@ -253,7 +253,7 @@ export class Redis extends Construct {
protocol: 'TCP',
}],
selector: {
'app.kubernetes.io/name': name,
app: name,
},
},
});
Expand All @@ -262,7 +262,7 @@ export class Redis extends Construct {
metadata: {
name: name,
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
spec: {
Expand All @@ -274,20 +274,22 @@ export class Redis extends Construct {
},
selector: {
matchLabels: {
'app.kubernetes.io/name': name,
app: name,
},
},
replicas: replicas,
serviceName: hsvc.name,
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: {
Expand All @@ -303,7 +305,7 @@ export class Redis extends Construct {
podAffinityTerm: {
labelSelector: {
matchLabels: {
'app.kubernetes.io/name': name,
app: name,
},
},
namespaces: [ns],
Expand Down Expand Up @@ -469,7 +471,7 @@ export class Redis extends Construct {
metadata: {
name: 'redis-data',
labels: {
'app.kubernetes.io/name': name,
app: name,
},
},
spec: {
Expand Down
55 changes: 30 additions & 25 deletions test/__snapshots__/hello.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e1abfb8

Please sign in to comment.