Update chart configuration of deployment and service

Co-Authored-By: Radosław Piliszek <rpiliszek@7bulls.com>
Co-Authored-By: Jan Marchel <jmarchel@7bulls.com>
Change-Id: I66d9973313d07edace843c765cc91efbdfb72da0

charts/nebulous-activemq/templates/NOTES.txt

@@ -17,6 +17,6 @@
 {{- else if contains "ClusterIP" .Values.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "nebulous-activemq.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
+  echo "Visit http://127.0.0.1:8161/admin to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8161:$CONTAINER_PORT
 {{- end }}

charts/nebulous-activemq/templates/deployment.yaml

@@ -29,22 +29,25 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
+          env:
+            {{- toYaml .Values.brokerEnv | nindent 12 }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-            - name: http
+            - name: gui
-              containerPort: 8080
+              containerPort: 8161
+              protocol: TCP
+            - name: activemq
+              containerPort: 61616
               protocol: TCP
           livenessProbe:
-            httpGet:
+            tcpSocket:
-              path: /
+              port: activemq
-              port: http
           readinessProbe:
-            httpGet:
+            tcpSocket:
-              path: /
+              port: activemq
-              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

charts/nebulous-activemq/templates/service.yaml

@@ -7,9 +7,13 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
+    - port: {{ .Values.service.guiPort }}
-      targetPort: http
+      targetPort: gui
       protocol: TCP
-      name: http
+      name: gui
+    - port: {{ .Values.service.activemqPort }}
+      targetPort: activemq
+      protocol: TCP
+      name: activemq
   selector:
     {{- include "nebulous-activemq.selectorLabels" . | nindent 4 }}

charts/nebulous-activemq/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: "quay.io/nebulous/activemq-java-spring-boot-demo"
+  repository: "quay.io/nebulous/activemq-broker"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -38,7 +38,8 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
+  guiPort: 8161 
+  activemqPort: 61616
 
 ingress:
   enabled: false
@@ -80,3 +81,11 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+brokerEnv:
+- name: ACTIVEMQ_NAME
+  value: activemq
+- name: ACTIVEMQ_PASSWORD
+  value: nebulous
+- name: ACTIVEMQ_USERNAME
+  value: admin

docker/Dockerfile

@@ -0,0 +1,2 @@
+# Use the official Apache ActiveMQ image
+FROM docker.io/apache/activemq-classic:5.18.2

java-spring-boot-demo/.gitignore

@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

java-spring-boot-demo/Dockerfile

@@ -1,15 +0,0 @@
-#
-# Build stage
-#
-FROM docker.io/library/maven:3.9.2-eclipse-temurin-17 AS build
-COPY src /home/app/src
-COPY pom.xml /home/app
-RUN mvn -f /home/app/pom.xml clean package
-
-#
-# Package stage
-#
-FROM docker.io/library/eclipse-temurin:17-jre
-COPY --from=build /home/app/target/demo-0.0.1-SNAPSHOT.jar /usr/local/lib/demo.jar
-EXPOSE 8080
-ENTRYPOINT ["java","-jar","/usr/local/lib/demo.jar"]

java-spring-boot-demo/pom.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>com.example</groupId>
-    <artifactId>demo</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>demo</name>
-    <description>Demo project for Spring Boot</description>
-    <properties>
-        <java.version>17</java.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>

java-spring-boot-demo/src/main/java/com/example/demo/DemoApplication.java

@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class DemoApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(DemoApplication.class, args);
-    }
-
-}

java-spring-boot-demo/src/main/java/com/example/demo/DemoController.java

@@ -1,14 +0,0 @@
-package com.example.demo;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class DemoController {
-
-    @RequestMapping("/")
-    public Object root() {
-        return null;
-    }
-
-}

java-spring-boot-demo/src/test/java/com/example/demo/DemoApplicationTests.java

@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DemoApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

zuul.d/jobs.yaml

@@ -8,15 +8,15 @@
       - nebulous-activemq-container-images
     description: Build the container images.
     files: &image_files
-      - ^java-spring-boot-demo/
+      - ^docker/
     vars: &image_vars
       promote_container_image_job: nebulous-activemq-upload-container-images
       container_images:
-        - context: java-spring-boot-demo
+        - context: docker
           registry: quay.io
-          repository: quay.io/nebulous/activemq-java-spring-boot-demo
+          repository: quay.io/nebulous/activemq-broker
           namespace: nebulous
-          repo_shortname: activemq-java-spring-boot-demo
+          repo_shortname: activemq-broker
           repo_description: ""
 
 - job:
@@ -44,7 +44,7 @@
     description: Run Hadolint on Dockerfile(s).
     vars:
       dockerfiles:
-        - java-spring-boot-demo/Dockerfile
+        - docker/Dockerfile
 
 - job:
     name: nebulous-activemq-helm-lint

zuul.d/project.yaml

@@ -5,6 +5,8 @@
         - nebulous-activemq-helm-lint
         - nebulous-activemq-build-container-images
         - nebulous-activemq-hadolint
+        # TODO: temporary, remove
+        - nebulous-activemq-apply-helm-charts
         - nebulous-platform-apply-helm-charts
         - nox-linters
     gate: