Use Drone semver

.drone.yml

@@ -88,10 +88,71 @@ volumes:
       path: /var/lib/drone/cache/.gradle
 
 trigger:
-  branches:
-    - main
   event:
     include:
-      - push
+      - tag
       - custom
 
+---
+kind: pipeline
+name: deploy image
+type: docker
+
+platform:
+  os: linux
+  arch: arm64
+
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    environment:
+      SSH_KEY:
+        from_secret: ssh_key
+    commands:
+      - mkdir $HOME/.ssh
+      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
+      - chmod 600 $HOME/.ssh/id_ed25519
+      - touch $HOME/.ssh/known_hosts
+      - chmod 600 $HOME/.ssh/known_hosts
+      - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
+      - git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
+      - git checkout main
+  - name: modify deployed image
+    image: alpine
+    commands:
+      - sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
+  - name: save modified variable file
+    image: alpine/git
+    environment:
+      SSH_KEY:
+        from_secret: ssh_key
+    commands:
+      - mkdir $HOME/.ssh
+      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
+      - chmod 600 $HOME/.ssh/id_ed25519
+      - touch $HOME/.ssh/known_hosts
+      - chmod 600 $HOME/.ssh/known_hosts
+      - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
+      - git add ansible/inventories/host_vars/api-server/public.yaml
+      - git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
+      - git push origin main
+  - name: deploy image
+    image: plugins/ansible:latest
+    settings:
+      playbook: ansible/deploy_spring.yaml
+      inventory: ansible/inventories/production
+      private_key:
+        from_secret: ssh_key
+      vault_password:
+        from_secret: vault_password
+
+trigger:
+  target:
+    - production
+  event:
+    include:
+      - promote
+      - rollback

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/KafkaConfiguration.kt

@@ -1,18 +0,0 @@
-package de.twomartens.wahlrecht.configuration
-
-import org.apache.kafka.clients.admin.AdminClientConfig
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Profile
-import org.springframework.kafka.core.KafkaAdmin
-
-@Configuration
-open class KafkaConfiguration {
-    @Bean
-    @Profile("prod")
-    open fun kafkaProd() = KafkaAdmin(mapOf(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG to "kafka:9092"))
-
-    @Bean
-    @Profile("dev")
-    open fun kafkaDev() = KafkaAdmin(mapOf(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG to "localhost:9092"))
-}

module-server/src/main/kotlin/de/twomartens/wahlrecht/property/ServiceProperties.kt

@@ -2,11 +2,13 @@ package de.twomartens.wahlrecht.property
 
 import io.swagger.v3.oas.annotations.media.Schema
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.bind.ConstructorBinding
 import org.springframework.cloud.context.config.annotation.RefreshScope
 import java.time.ZoneId
 
 @RefreshScope
 @ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
 @Schema(description = "Properties, to configure this Application")
-data class ServiceProperties @ConstructorBinding constructor(val defaultTimeZone: ZoneId, val greeting: String)
+class ServiceProperties {
+    lateinit var defaultTimeZone: ZoneId
+    lateinit var greeting: String
+}

module-server/src/main/resources/application-prod.yaml

@@ -1,5 +1,7 @@
 spring:
   config:
     import:
-      - "classpath:config/wahlrecht.yaml"
-      - "optional:configserver:http://configserver:8888/config"
+      - "configserver:http://configserver:8888/config"
+  kafka:
+    bootstrap-servers:
+      - kafka:9092

module-server/src/main/resources/application.yaml

@@ -38,6 +38,8 @@ spring:
       resourceserver:
         jwt:
           jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
+  application:
+    name: wahlrecht
 
 springdoc:
   swagger-ui:

module-server/src/main/resources/config/wahlrecht-prod.yaml

@@ -1,2 +1,2 @@
 de.twomartens.wahlrecht:
-  greeting: "Moin %s, you are great"
+  greeting: "Moin %s, you are test"