fix labels, names and selectors

src/backend-deployment.ts

@@ -36,28 +36,26 @@ export class PloneBackendDeployment extends Construct {
     const image = options.image ?? 'plone/plone-backend:latest';
     const replicas = options.replicas ?? 2;
     const label = { app: Names.toLabelValue(this) };
-    const labels = {
+    const template_labels = {
       ...options.labels ?? {},
       ...label,
     };
-    const deployment_name = id + '-deployment';
-    const pod_name = id + '-pod';
 
     const deploymentOpts: k8s.KubeDeploymentProps = {
       metadata: {
-        name: deployment_name,
+        labels: options.labels ?? {},
       },
       spec: {
         replicas,
         selector: {
           matchLabels: label,
         },
         template: {
-          metadata: { labels: labels },
+          metadata: { labels: template_labels },
           spec: {
             containers: [
               {
-                name: pod_name,
+                name: id + '-container', // here the namespaced name shold be used, but how?
                 image: image,
               },
             ],

src/backend-service.ts

@@ -15,6 +15,11 @@ export interface PloneBackendServiceOptions {
    */
   readonly targetPort?: number;
 
+  /**
+   * Selector label.
+   */
+  readonly selector_label: { [name: string]: string };
+
   /**
    * Extra labels to associate with resources.
    * @default - none
@@ -24,23 +29,22 @@ export interface PloneBackendServiceOptions {
 
 export class PloneBackendService extends Construct {
 
-  constructor(scope: Construct, id: string, options: PloneBackendServiceOptions = {}) {
+  constructor(scope: Construct, id: string, options: PloneBackendServiceOptions) {
     super(scope, id);
 
     const port = options.port ?? 8080;
     const targetPort = IntOrString.fromNumber(options.targetPort ?? 8080);
-    const labels = options.labels ?? {};
-    const name = id + '-service';
+    const selector_label = options.selector_label;
 
     const serviceOpts: KubeServiceProps = {
       metadata: {
-        name: name,
+        labels: options.labels ?? {},
       },
       spec: {
         type: 'ClusterIP',
         clusterIp: 'None',
         ports: [{ port: port, targetPort: targetPort }],
-        selector: labels,
+        selector: selector_label,
       },
     };
     new KubeService(this, 'service', serviceOpts);

src/backend.ts

@@ -1,3 +1,4 @@
+import { Names } from 'cdk8s';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Construct } from 'constructs';
 import { PloneBackendDeploymentOptions, PloneBackendDeployment } from './backend-deployment';
@@ -12,13 +13,16 @@ export class PloneBackend extends Construct {
 
   constructor(scope: Construct, id: string, options: PloneBackendOptions = {}) {
     super(scope, id);
-    const deployment = options.deployment ?? {};
-    const service = options.service ?? {};
+    const deploymentOptions = options.deployment ?? {};
 
     // Create a deployment
-    new PloneBackendDeployment(this, 'deployment', deployment);
+    const deployment = new PloneBackendDeployment(this, 'deployment', deploymentOptions);
 
     // Create a service
-    new PloneBackendService(this, 'service', service);
+    const serviceOptions = {
+      ...options.service ?? {},
+      selector_label: { app: Names.toLabelValue(deployment) },
+    };
+    new PloneBackendService(this, 'service', serviceOptions);
   }
 }

test/backend.test.ts

@@ -5,10 +5,10 @@ import { PloneBackend } from '../src/backend';
 test('defaults', () => {
   // GIVEN
   const app = Testing.app();
-  const chart = new Chart(app, 'test');
+  const chart = new Chart(app, 'plone');
 
   // WHEN
-  new PloneBackend(chart, 'plone');
+  new PloneBackend(chart, 'backend');
 
   // THEN
   expect(Testing.synth(chart)).toMatchSnapshot();