diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md index e285aec2c..5bef59b0f 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md @@ -19,6 +19,7 @@ _**NOTE:**_ *the version should match the aiSSEMBLE project version.* | Property | Description | Default | |----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------| +| app.name | Sets label for app.kubernetes.io/name | Chart.Name (aissemble-spark-history-chart) | | enable | Enable or disable the entirety of the spark-history-server deployment. When false, equivalent to not installing the chart. | true | | deployment.annotations | Annotations to apply to the Spark History Server Deployment. | {} | | deployment.labels | Labels to apply to the Spark History Server Deployment. | {} | diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml index 0dabc8f18..d76e1cd67 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml @@ -2,21 +2,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }}-shs + name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.annotations }} annotations: {{ toYaml .Values.deployment.annotations | default "" }} {{- end }} labels: - app: {{ .Release.Name }} - {{- if .Values.deployment.labels }} - {{ toYaml .Values.deployment.labels }} - {{- end }} + app.kubernetes.io/instance: "{{ .Values.app.name | default .Chart.Name }}" + app.kubernetes.io/name: "{{ .Values.app.name | default .Chart.Name }}" + {{- if .Values.deployment.labels }} + {{ toYaml .Values.deployment.labels }} + {{- end }} spec: replicas: {{ .Values.deployment.replicas }} selector: matchLabels: - app: {{ .Release.Name }} + name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.labels }} {{ toYaml .Values.deployment.labels }} {{- end }} @@ -27,7 +28,8 @@ spec: {{ toYaml .Values.deployment.annotations | default "" }} {{- end }} labels: - app: {{ .Release.Name }} + app.kubernetes.io/instance: "{{ .Values.app.name | default .Chart.Name }}" + app.kubernetes.io/name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.labels }} {{ toYaml .Values.deployment.labels }} {{- end }} diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml index 9130af599..f77fed99f 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml @@ -38,14 +38,20 @@ tests: deployment.labels.label1: label2 asserts: - equal: - path: metadata.labels.app - value: RELEASE-NAME + path: spec.selector.matchLabels.name + value: aissemble-spark-history-chart - equal: - path: spec.template.metadata.labels.app - value: RELEASE-NAME + path: metadata.labels["app.kubernetes.io/instance"] + value: aissemble-spark-history-chart - equal: - path: spec.selector.matchLabels.app - value: RELEASE-NAME + path: metadata.labels["app.kubernetes.io/name"] + value: aissemble-spark-history-chart + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: aissemble-spark-history-chart + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: aissemble-spark-history-chart - it: Should apply requested annotations set: diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml index 3f335b0a7..fee288d6d 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml @@ -1,4 +1,7 @@ # This file contains the default values for the aiSSEMBLE Spark History Helm chart. +app: + # Sets labels for app.kubernetes.io/name Default is Chart.Name (aissemble-spark-history-chart) + name: '' enable: true diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/README.md b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/README.md index 8e96ef5fe..83e817e1b 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/README.md +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/README.md @@ -19,6 +19,7 @@ _**NOTE:**_ *the version should match the aiSSEMBLE project version.* | Property | Description | Default | |----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------| +| app.name | Sets label for app.kubernetes.io/name | Chart.Name (aissemble-thrift-server-chart) | | enable | Enable or disable the entirety of the spark-thrift-server deployment. When false, equivalent to not installing the chart. | true | | deployment.annotations | Annotations to apply to the Spark Thrift Server Deployment. | {} | | deployment.labels | Labels to apply to the Spark Thrift Server Deployment. | {} | diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/templates/deployment.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/templates/deployment.yaml index 41eb41617..659a7b74e 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/templates/deployment.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/templates/deployment.yaml @@ -2,21 +2,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }}-sts + name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.annotations }} annotations: {{ toYaml .Values.deployment.annotations | default "" }} {{- end }} labels: - app: {{ .Release.Name }} - {{- if .Values.deployment.labels }} - {{ toYaml .Values.deployment.labels }} - {{- end }} + app.kubernetes.io/instance: "{{ .Values.app.name | default .Chart.Name }}" + app.kubernetes.io/name: "{{ .Values.app.name | default .Chart.Name }}" + {{- if .Values.deployment.labels }} + {{ toYaml .Values.deployment.labels }} + {{- end }} spec: replicas: {{ .Values.deployment.replicas }} selector: matchLabels: - app: {{ .Release.Name }} + name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.labels }} {{ toYaml .Values.deployment.labels }} {{- end }} @@ -27,7 +28,8 @@ spec: {{ toYaml .Values.deployment.annotations | default "" }} {{- end }} labels: - app: {{ .Release.Name }} + app.kubernetes.io/instance: "{{ .Values.app.name | default .Chart.Name }}" + app.kubernetes.io/name: "{{ .Values.app.name | default .Chart.Name }}" {{- if .Values.deployment.labels }} {{ toYaml .Values.deployment.labels }} {{- end }} diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/tests/deployment_test.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/tests/deployment_test.yaml index f52871f2c..74d4608dc 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/tests/deployment_test.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/tests/deployment_test.yaml @@ -38,14 +38,20 @@ tests: deployment.labels.label1: label2 asserts: - equal: - path: metadata.labels.app - value: RELEASE-NAME + path: spec.selector.matchLabels.name + value: aissemble-thrift-server-chart - equal: - path: spec.template.metadata.labels.app - value: RELEASE-NAME + path: metadata.labels["app.kubernetes.io/instance"] + value: aissemble-thrift-server-chart - equal: - path: spec.selector.matchLabels.app - value: RELEASE-NAME + path: metadata.labels["app.kubernetes.io/name"] + value: aissemble-thrift-server-chart + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: aissemble-thrift-server-chart + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: aissemble-thrift-server-chart - it: Should apply requested annotations set: diff --git a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/values.yaml b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/values.yaml index ea8d2eb58..9348b5674 100644 --- a/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/values.yaml +++ b/extensions/extensions-helm/extensions-helm-spark-infrastructure/aissemble-thrift-server-chart/values.yaml @@ -1,5 +1,9 @@ # This file contains the default values for the aiSSEMBLE Thrift Service Helm chart. +app: + # Sets labels for app.kubernetes.io/name Default is Chart.Name (aissemble-thrift-server-chart) + name: '' + enable: true deployment: diff --git a/foundation/foundation-mda/src/main/resources/templates/general-docker/it.java.docker.file.vm b/foundation/foundation-mda/src/main/resources/templates/general-docker/it.java.docker.file.vm index d4d9339c5..02605c1fe 100644 --- a/foundation/foundation-mda/src/main/resources/templates/general-docker/it.java.docker.file.vm +++ b/foundation/foundation-mda/src/main/resources/templates/general-docker/it.java.docker.file.vm @@ -3,8 +3,7 @@ # GENERATED DOCKERFILE - please ***DO*** modify. # # Generated from: ${templateName} -ARG DOCKER_BASELINE_REPO_ID -FROM openjdk:11-slim +FROM openjdk:17-jdk-slim COPY ./target/specifications/ ./specifications COPY ./target/${artifactId}.jar ./ diff --git a/foundation/foundation-mda/src/main/resources/templates/integration-test/it.tiltfile.vm b/foundation/foundation-mda/src/main/resources/templates/integration-test/it.tiltfile.vm index dc63acc73..06db0e565 100644 --- a/foundation/foundation-mda/src/main/resources/templates/integration-test/it.tiltfile.vm +++ b/foundation/foundation-mda/src/main/resources/templates/integration-test/it.tiltfile.vm @@ -41,22 +41,6 @@ parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/spark-operator/ ) k8s_yaml(yaml) - -# Hive Metastore DB -yaml = helm( - parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/hive-metastore-db', - values=[parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/hive-metastore-db/values.yaml'] -) -k8s_yaml(yaml) - -# Zookeeper Alert -yaml = helm( - parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/zookeeper-alert', - values=[parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/zookeeper-alert/values.yaml', - parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/zookeeper-alert/values-dev.yaml'] -) -k8s_yaml(yaml) - # Kafka yaml = helm( parent_dir + '${parentArtifactId}-deploy/src/main/resources/apps/kafka-cluster', @@ -67,7 +51,7 @@ k8s_yaml(yaml) # Policy Decision Point docker_build( - ref='boozallen/${parentArtifactId}-policy-decision-point-docker', + ref='${parentArtifactId}-policy-decision-point-docker', context=parent_dir + '${parentArtifactId}-docker/${parentArtifactId}-policy-decision-point-docker', build_args=build_args, dockerfile=parent_dir + '${parentArtifactId}-docker/${parentArtifactId}-policy-decision-point-docker/src/main/resources/docker/Dockerfile' diff --git a/foundation/foundation-mda/src/main/resources/templates/integration-test/it.values.pipeline.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/integration-test/it.values.pipeline.yaml.vm index 97ec58cc5..bbf5b1693 100644 --- a/foundation/foundation-mda/src/main/resources/templates/integration-test/it.values.pipeline.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/templates/integration-test/it.values.pipeline.yaml.vm @@ -5,4 +5,4 @@ deployment: - name: wait-for-spark-operator image: busybox:latest command: [ "/bin/sh","-c" ] - args: [ "until nc -vz spark-operator-webhook.default 443; do sleep 5; echo 'waiting for spark operator...'; done" ] + args: [ "until nc -vz spark-operator-webhook-svc.default 443; do sleep 5; echo 'waiting for spark operator...'; done" ]