Updated to use templating-maven-plugin

NDViet · Sep 26, 2023 · c552d73 · c552d73
1 parent d2f4a85
commit c552d73
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,5 +37,4 @@ build/
 ### Helm ###
 **/*.tgz
 **/*.lock
-**/patch-selenium-grid/charts
-**/Chart.yaml
+**/patch-selenium-grid/charts
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 This umbrella chart is created to deploy my motivation for a Scalable Selenium Grid, details as below
 
+Fortunately, [Selenium-Grid Helm Chart](charts/selenium-grid/README.md) added autoscaling in default values.yaml from version [0.19.0](https://github.com/SeleniumHQ/docker-selenium/blob/trunk/charts/selenium-grid/CHANGELOG.md#heavy_check_mark-0190)
+
 ![Scalable Grid](docs/central_grid_diagram.png)
 
 More details on my motivation are mentioned in the presentation [here](docs/Topic_Scalable-Parallel-AT_Publish.pdf).

diff --git a/component-pvc/pom.xml b/component-pvc/pom.xml
@@ -6,15 +6,16 @@
     <parent>
         <groupId>org.ndviet</groupId>
         <artifactId>test-scaling-grid</artifactId>
-        <version>23.5.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>component-pvc</artifactId>
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>io.kokuwa.maven</groupId>
@@ -32,7 +33,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <chartDirectory>${project.basedir}/src/main/resources</chartDirectory>
                     <chartVersion>${project.version}</chartVersion>
                     <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                     <lintStrict>true</lintStrict>

diff --git a/...sources/component-pvc/Chart_template.yaml → ...c/main/resources/component-pvc/Chart.yaml b/...sources/component-pvc/Chart_template.yaml → ...c/main/resources/component-pvc/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: component-pvc
 description: A Helm individual chart to create PV and PVC for a component in Grid
 type: application
-version: @chart.this.version@
-appVersion: "@chart.this.version@"
+version: ${chart.this.version}
+appVersion: "${chart.this.version}"
diff --git a/component-scaler/pom.xml b/component-scaler/pom.xml
@@ -6,15 +6,16 @@
     <parent>
         <groupId>org.ndviet</groupId>
         <artifactId>test-scaling-grid</artifactId>
-        <version>23.5.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>component-scaler</artifactId>
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>io.kokuwa.maven</groupId>
@@ -32,7 +33,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <chartDirectory>${project.basedir}/src/main/resources</chartDirectory>
                     <chartVersion>${project.version}</chartVersion>
                     <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                     <lintStrict>true</lintStrict>

diff --git a/...rces/component-scaler/Chart_template.yaml → ...ain/resources/component-scaler/Chart.yaml b/...rces/component-scaler/Chart_template.yaml → ...ain/resources/component-scaler/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: component-scaler
 description: A Helm chart for Kubernetes
 type: application
-version: @chart.this.version@
-appVersion: "@chart.this.version@"
+version: ${chart.this.version}
+appVersion: "${chart.this.version}"
diff --git a/grid-autoscaling/pom.xml b/grid-autoscaling/pom.xml
@@ -6,15 +6,16 @@
     <parent>
         <groupId>org.ndviet</groupId>
         <artifactId>test-scaling-grid</artifactId>
-        <version>23.5.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>grid-autoscaling</artifactId>
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>io.kokuwa.maven</groupId>
@@ -32,7 +33,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <chartDirectory>${project.basedir}/src/main/resources</chartDirectory>
                     <chartVersion>${project.version}</chartVersion>
                     <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                     <lintStrict>true</lintStrict>

diff --git a/grid-autoscaling/src/main/resources/grid-autoscaling/Chart.yaml b/grid-autoscaling/src/main/resources/grid-autoscaling/Chart.yaml
@@ -0,0 +1,22 @@
+apiVersion: v2
+name: grid-autoscaling
+description: A Helm chart for Kubernetes
+type: application
+version: ${chart.this.version}
+appVersion: "${chart.this.version}"
+dependencies:
+  - alias: scale-chrome-node
+    condition: scale-chrome-node.enabled
+    name: component-scaler
+    repository: file://../../../../component-scaler/target/classes/component-scaler
+    version: ${chart.this.version}
+  - alias: scale-firefox-node
+    condition: scale-firefox-node.enabled
+    name: component-scaler
+    repository: file://../../../../component-scaler/target/classes/component-scaler
+    version: ${chart.this.version}
+  - alias: scale-edge-node
+    condition: scale-edge-node.enabled
+    name: component-scaler
+    repository: file://../../../../component-scaler/target/classes/component-scaler
+    version: ${chart.this.version}
diff --git a/grid-autoscaling/src/main/resources/grid-autoscaling/Chart_template.yaml b/grid-autoscaling/src/main/resources/grid-autoscaling/Chart_template.yaml
diff --git a/grid-pvc/pom.xml b/grid-pvc/pom.xml
@@ -6,15 +6,16 @@
     <parent>
         <groupId>org.ndviet</groupId>
         <artifactId>test-scaling-grid</artifactId>
-        <version>23.5.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>grid-pvc</artifactId>
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>io.kokuwa.maven</groupId>
@@ -32,7 +33,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <chartDirectory>${project.basedir}/src/main/resources</chartDirectory>
                     <chartVersion>${project.version}</chartVersion>
                     <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                     <lintStrict>true</lintStrict>

diff --git a/...in/resources/grid-pvc/Chart_template.yaml → ...vc/src/main/resources/grid-pvc/Chart.yaml b/...in/resources/grid-pvc/Chart_template.yaml → ...vc/src/main/resources/grid-pvc/Chart.yaml
@@ -2,36 +2,36 @@ apiVersion: v2
 name: grid-pvc
 description: A Helm chart for Kubernetes
 type: application
-version: @chart.this.version@
-appVersion: "@chart.this.version@"
+version: ${chart.this.version}
+appVersion: "${chart.this.version}"
 dependencies:
   - alias: selenium-chrome-node
     condition: global.seleniumGrid.persistence.enabled,selenium-chrome-node.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
   - alias: selenium-chrome-video
     condition: global.seleniumGrid.persistence.enabled,selenium-chrome-video.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
   - alias: selenium-firefox-node
     condition: global.seleniumGrid.persistence.enabled,selenium-firefox-node.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
   - alias: selenium-firefox-video
     condition: global.seleniumGrid.persistence.enabled,selenium-firefox-video.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
   - alias: selenium-edge-node
     condition: global.seleniumGrid.persistence.enabled,selenium-edge-node.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
   - alias: selenium-edge-video
     condition: global.seleniumGrid.persistence.enabled,selenium-edge-video.persistence.enabled
     name: component-pvc
-    repository: file://../../../../../component-pvc/src/main/resources/component-pvc
-    version: @chart.this.version@
+    repository: file://../../../../component-pvc/target/classes/component-pvc
+    version: ${chart.this.version}
diff --git a/patch-selenium-grid/pom.xml b/patch-selenium-grid/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ndviet</groupId>
         <artifactId>test-scaling-grid</artifactId>
-        <version>23.5.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>patch-selenium-grid</artifactId>
@@ -18,6 +18,11 @@
         <!--        process-resources: replace patch files to origin chart templates -->
         <!--        package: package-patched-chart -->
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
@@ -45,8 +50,8 @@
                         <configuration>
                             <target>
                                 <untar compression="gzip"
-                                       dest="${project.basedir}/src/main/resources/patch-selenium-grid/charts">
-                                    <fileset dir="${project.basedir}/src/main/resources/patch-selenium-grid/charts">
+                                       dest="${project.basedir}/target/classes/patch-selenium-grid/charts">
+                                    <fileset dir="${project.basedir}/target/classes/patch-selenium-grid/charts">
                                         <include name="*.tgz"/>
                                     </fileset>
                                 </untar>
@@ -61,7 +66,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <copy todir="${project.basedir}/src/main/resources/patch-selenium-grid/charts/selenium-grid/templates">
+                                <copy todir="${project.build.directory}/classes/patch-selenium-grid/charts/selenium-grid/templates">
                                     <fileset
                                             dir="${project.basedir}/src/main/resources/patch-selenium-grid/patch/templates"/>
                                 </copy>
@@ -83,10 +88,10 @@
                             <goal>dependency-build</goal>
                         </goals>
                         <configuration>
-                            <chartDirectory>${project.basedir}/src/main/resources</chartDirectory>
                             <chartVersion>${project.version}</chartVersion>
                             <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                             <useLocalHelmBinary>true</useLocalHelmBinary>
+                            <autoDetectLocalHelmBinary>true</autoDetectLocalHelmBinary>
                         </configuration>
                     </execution>
                     <execution>
@@ -97,9 +102,6 @@
                             <goal>package</goal>
                         </goals>
                         <configuration>
-                            <chartDirectory>
-                                ${project.basedir}/src/main/resources/patch-selenium-grid/charts/selenium-grid
-                            </chartDirectory>
                             <chartVersion>${chart.selenium.version}</chartVersion>
                             <outputDirectory>${project.parent.build.directory}/helm/repo</outputDirectory>
                             <useLocalHelmBinary>true</useLocalHelmBinary>

diff --git a/patch-selenium-grid/src/main/resources/patch-selenium-grid/Chart.yaml b/patch-selenium-grid/src/main/resources/patch-selenium-grid/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v2
+name: patch-selenium-grid
+description: A Helm chart for Kubernetes
+type: application
+version: ${chart.this.version}
+appVersion: "${chart.this.version}"
+dependencies:
+  - name: ${chart.selenium.name}
+    repository: ${chart.selenium.repository}
+    version: ${chart.selenium.version}
+    tags:
+      - selenium-grid
diff --git a/patch-selenium-grid/src/main/resources/patch-selenium-grid/Chart_template.yaml b/patch-selenium-grid/src/main/resources/patch-selenium-grid/Chart_template.yaml