Add image pull secrets to platform configs

- Relates #4732

Author: jvalkeal

src/carvel/config/dataflow.lib.yml

@@ -3,10 +3,17 @@
 #@ load("@ytt:template", "template")
 #@ load("db/db.lib.yml", "dataflow_datasource_config")
 #@ load("monitoring/monitoring.star", "grafana_enabled")
+#@ load("dataflow.star", "has_image_pull_secrets")
+#@ load("dataflow.star", "registry_secret_ref")
 
 #@ def dataflow_platform_config():
 limits:
   memory: 1024Mi
+#@ if has_image_pull_secrets():
+imagePullSecret: #@ registry_secret_ref()
+#@ else:
+imagePullSecret: reg-creds
+#@ end
 #@ end
 
 #@ def base_config():

src/carvel/config/skipper.lib.yml

@@ -2,6 +2,8 @@
 #@ load("@ytt:overlay", "overlay")
 #@ load("@ytt:template", "template")
 #@ load("skipper.star", "env_config")
+#@ load("skipper.star", "has_image_pull_secrets")
+#@ load("skipper.star", "registry_secret_ref")
 #@ load("db/db.lib.yml", "skipper_datasource_config")
 #@ load("monitoring/monitoring.star", "grafana_enabled")
 
@@ -12,6 +14,11 @@ limits:
   cpu: 500m
 readinessProbeDelay: 120
 livenessProbeDelay: 90
+#@ if has_image_pull_secrets():
+imagePullSecret: #@ registry_secret_ref()
+#@ else:
+imagePullSecret: reg-creds
+#@ end
 #@ end
 
 #@ def base_config():

src/carvel/test/servers.test.ts

@@ -96,7 +96,7 @@ describe('servers', () => {
     expect(skipperContainer?.image).toBe('springcloud/spring-cloud-skipper-server@fakedigest2');
   });
 
-  it('no additional dataflow server config', async () => {
+  it('should have default server config', async () => {
     const result = await execYtt({
       files: ['config'],
       dataValueYamls: [
@@ -111,9 +111,72 @@ describe('servers', () => {
     expect(result.success).toBeTruthy();
     const yaml = result.stdout;
 
-    const skipperConfigMap = findConfigMap(yaml, SCDF_SERVER_NAME);
-    const applicationYaml = skipperConfigMap?.data ? skipperConfigMap.data['application.yaml'] : undefined;
-    expect(applicationYaml).toContain('spring');
+    const dataflowConfigMap = findConfigMap(yaml, SCDF_SERVER_NAME);
+    const skipperConfigMap = findConfigMap(yaml, SKIPPER_NAME);
+
+    const dataflowApplicationYaml = dataflowConfigMap?.data ? dataflowConfigMap.data['application.yaml'] : '';
+    const skipperApplicationYaml = skipperConfigMap?.data ? skipperConfigMap.data['application.yaml'] : '';
+
+    const dataflowDoc = parseYamlDocument(dataflowApplicationYaml);
+    const dataflowJson = dataflowDoc.toJSON();
+    const skipperDoc = parseYamlDocument(skipperApplicationYaml);
+    const skipperJson = skipperDoc.toJSON();
+
+    const dataflowPlatformLimitsMemory = lodash.get(
+      dataflowJson,
+      'spring.cloud.dataflow.task.platform.kubernetes.accounts.default.limits.memory'
+    ) as string;
+    expect(dataflowPlatformLimitsMemory).toEqual('1024Mi');
+
+    const dataflowPlatformImagePullSecret = lodash.get(
+      dataflowJson,
+      'spring.cloud.dataflow.task.platform.kubernetes.accounts.default.imagePullSecret'
+    ) as string;
+    expect(dataflowPlatformImagePullSecret).toEqual('reg-creds');
+
+    const skipperPlatformLimitsMemory = lodash.get(
+      skipperJson,
+      'spring.cloud.skipper.server.platform.kubernetes.accounts.default.limits.memory'
+    ) as string;
+    expect(skipperPlatformLimitsMemory).toEqual('1024Mi');
+
+    const skipperPlatformImagePullSecret = lodash.get(
+      skipperJson,
+      'spring.cloud.skipper.server.platform.kubernetes.accounts.default.imagePullSecret'
+    ) as string;
+    expect(skipperPlatformImagePullSecret).toEqual('reg-creds');
+  });
+
+  it('should change server config', async () => {
+    const result = await execYtt({
+      files: ['config'],
+      dataValueYamls: [...DEFAULT_REQUIRED_DATA_VALUES, 'scdf.registry.secret.ref=fakeref']
+    });
+    expect(result.success).toBeTruthy();
+    const yaml = result.stdout;
+
+    const dataflowConfigMap = findConfigMap(yaml, SCDF_SERVER_NAME);
+    const skipperConfigMap = findConfigMap(yaml, SKIPPER_NAME);
+
+    const dataflowApplicationYaml = dataflowConfigMap?.data ? dataflowConfigMap.data['application.yaml'] : '';
+    const skipperApplicationYaml = skipperConfigMap?.data ? skipperConfigMap.data['application.yaml'] : '';
+
+    const dataflowDoc = parseYamlDocument(dataflowApplicationYaml);
+    const dataflowJson = dataflowDoc.toJSON();
+    const skipperDoc = parseYamlDocument(skipperApplicationYaml);
+    const skipperJson = skipperDoc.toJSON();
+
+    const dataflowPlatformImagePullSecret = lodash.get(
+      dataflowJson,
+      'spring.cloud.dataflow.task.platform.kubernetes.accounts.default.imagePullSecret'
+    ) as string;
+    expect(dataflowPlatformImagePullSecret).toEqual('fakeref');
+
+    const skipperPlatformImagePullSecret = lodash.get(
+      skipperJson,
+      'spring.cloud.skipper.server.platform.kubernetes.accounts.default.imagePullSecret'
+    ) as string;
+    expect(skipperPlatformImagePullSecret).toEqual('fakeref');
   });
 
   it('should have additional server config', async () => {