From bdcb6504aec675af31aa49fbea9241abd0d92cad Mon Sep 17 00:00:00 2001
From: The-Huginn <rbudinsk@redhat.com>
Date: Mon, 15 Jan 2024 11:30:19 +0100
Subject: [PATCH] Downgrade version of dataformat to match quarkus
 dependencies. Add kubernetes CronJob.

---
 README.md                                     | 29 +++++++++++++++++++
 deploy.sh                                     |  3 ++
 pom.xml                                       | 13 +++++----
 src/main/resources/application.properties     | 17 ++++++++++-
 .../jboss/set/draw/LotteryDrawingTest.java    |  3 +-
 5 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100755 deploy.sh

diff --git a/README.md b/README.md
index c8bd9ab..275ae26 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,35 @@ Fork this repository to your GitHub account.
    ```env
    jira-issue-lottery.access-token=<YOUR TOKEN>
    
+## Production deployment
+1. Log into your Openshift
+```shell
+oc login ...
+```
+2. Create secret
+```shell
+oc create secret generic jira-lottery
+--from-literal=JIRA_ISSUE_LOTTERY_ACCESS_TOKEN={TBD}
+--from-literal=QUARKUS_MAILER_FROM={TBD}
+--from-literal=QUARKUS_MAILER_USERNAME={TBD}
+--from-literal=QUARKUS_MAILER_PASSWORD={TBD}
+```
+3. Build the application, this step will eventually fail
+> **_NOTE:_**  You can use script `deploy.sh` for convenience.
+```shell
+./mvnw clean package -Dquarkus.openshift.deploy=true
+```
+4. Update CronJob deployment
+```shell
+cd target/kubernetes
+```
+And in file `openshift.yml` delete the following line `selector: {}`
+5. Deploy the YAML file
+```shell
+oc apply -f openshift.yml
+```
+
+   
 ## Running the application in dev mode
 
 You can run your application in dev mode that enables live coding using:
diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..63f60e7
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,3 @@
+./mvnw clean package -Dquarkus.kubernetes.deploy=true
+sed -i '/^\s*selector: {}/d' target/kubernetes/openshift.yml
+oc apply -f target/kubernetes/openshift.yml
diff --git a/pom.xml b/pom.xml
index b432fc3..382773d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,16 +7,16 @@
   <version>1.0.0-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <maven.compiler.release>21</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.5.3</quarkus.platform.version>
-    <version.checkstyle>3.3.1</version.checkstyle>
-    <version.org.wildfly.checkstyle>1.0.8.Final</version.org.wildfly.checkstyle>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
+    <version.checkstyle>3.3.1</version.checkstyle>
+    <version.org.wildfly.checkstyle>1.0.8.Final</version.org.wildfly.checkstyle>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -57,6 +57,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-mailer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-openshift</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
@@ -65,7 +69,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.16.0</version>
+      <version>2.15.3</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -182,7 +186,6 @@
           </dependency>
         </dependencies>
         <configuration>
-          <!-- store outside of target to speed up formatting when mvn clean is used -->
           <cachedir>.cache/formatter-maven-plugin-${formatter-maven-plugin.version}</cachedir>
           <configFile>eclipse-format.xml</configFile>
           <lineEnding>LF</lineEnding>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5ff7860..7f21da4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,18 @@
 camel.component.jira.jira-url=https://issues.redhat.com/
 %test.jira-issue-lottery.access-token=ignored
-jira-issue-lottery.config-file-repo=https://github.com/The-Huginn/jira-issue-lottery
\ No newline at end of file
+jira-issue-lottery.config-file-repo=https://github.com/The-Huginn/jira-issue-lottery
+quarkus.kubernetes.deployment-kind=cron-job
+# Cron expression to run the job every Monday see https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#writing-a-cronjob-spec
+quarkus.kubernetes.cron-job.schedule=* * * * 1
+quarkus.openshift.env.secrets=jira-lottery
+quarkus.openshift.labels.app=jira-issue-lottery
+
+# These 2 options are disabled to remove labels from selector field. However,
+#   a manual removal of selector field all together is needed in the generated yml file under target/kubernetes
+quarkus.openshift.add-version-to-label-selectors=false
+quarkus.openshift.add-name-to-label-selectors=false
+
+quarkus.mailer.auth-methods=DIGEST-MD5 CRAM-SHA256 CRAM-SHA1 CRAM-MD5 PLAIN LOGIN
+quarkus.mailer.host=smtp.gmail.com
+quarkus.mailer.port=465
+quarkus.mailer.ssl=true
\ No newline at end of file
diff --git a/src/test/java/org/jboss/set/draw/LotteryDrawingTest.java b/src/test/java/org/jboss/set/draw/LotteryDrawingTest.java
index 7602a86..8098b49 100644
--- a/src/test/java/org/jboss/set/draw/LotteryDrawingTest.java
+++ b/src/test/java/org/jboss/set/draw/LotteryDrawingTest.java
@@ -222,7 +222,8 @@ public void testAppendingRepositoryForUnsubcription() throws Exception {
         List<Mail> sent = mailbox.getMailsSentTo(email);
         assertEquals(1, sent.size());
         // Check directly for this URL as we know it is valid one. Using templates might result in a corrupted URL overall
-        assertTrue(sent.get(0).getText().contains("https://github.com/The-Huginn/jira-issue-lottery/blob/main/.github/jira-issue-lottery.yml"));
+        assertTrue(sent.get(0).getText()
+                .contains("https://github.com/The-Huginn/jira-issue-lottery/blob/main/.github/jira-issue-lottery.yml"));
     }
 
     @Test