wip

quarkiverse · Jul 20, 2023 · fe6fda0 · fe6fda0
1 parent 8ab0e6a
commit fe6fda0
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 55 deletions.
diff --git a/...ployment/src/main/java/io/quarkiverse/operatorsdk/deployment/helm/HelmChartProcessor.java b/...ployment/src/main/java/io/quarkiverse/operatorsdk/deployment/helm/HelmChartProcessor.java
@@ -1,21 +1,21 @@
 package io.quarkiverse.operatorsdk.deployment.helm;
 
-import io.quarkus.kubernetes.spi.GeneratedKubernetesResourceBuildItem;
+import java.util.List;
+
 import org.jboss.logging.Logger;
 
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
-
-import java.util.List;
+import io.quarkus.kubernetes.spi.GeneratedKubernetesResourceBuildItem;
 
 public class HelmChartProcessor {
 
     private static final Logger log = Logger.getLogger(HelmChartProcessor.class);
 
     @BuildStep
     public void handleHelmCharts(BuildProducer<ArtifactResultBuildItem> dummy,
-                                 List<GeneratedKubernetesResourceBuildItem> generatedResources) {
+            List<GeneratedKubernetesResourceBuildItem> generatedResources) {
 
         log.infov("Generating helm chart");
     }

diff --git a/core/deployment/src/test/java/io/quarkiverse/operatorsdk/test/HelmChartGeneratorTest.java b/core/deployment/src/test/java/io/quarkiverse/operatorsdk/test/HelmChartGeneratorTest.java
@@ -1,12 +1,13 @@
 package io.quarkiverse.operatorsdk.test;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
 import io.quarkiverse.operatorsdk.test.sources.SimpleCR;
 import io.quarkiverse.operatorsdk.test.sources.SimpleReconciler;
 import io.quarkiverse.operatorsdk.test.sources.SimpleSpec;
 import io.quarkiverse.operatorsdk.test.sources.SimpleStatus;
 import io.quarkus.test.QuarkusProdModeTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class HelmChartGeneratorTest {
 
@@ -17,7 +18,6 @@ public class HelmChartGeneratorTest {
                     (jar) -> jar.addClasses(SimpleReconciler.class, SimpleCR.class, SimpleSpec.class, SimpleStatus.class))
             .overrideConfigKey("quarkus.operator-sdk.crd.generate", "false");
 
-
     @Test
     void generatesHelmChart() {
 

diff --git a/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/Version.java b/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/Version.java
@@ -2,9 +2,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
 import java.util.Date;
 import java.util.Properties;
 
@@ -68,11 +65,11 @@ public static Version loadFromProperties() {
 
         Date builtTime = new Date();
         // todo check how to run this from intellij
-//        try {
-//            builtTime = (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")).parse(properties.getProperty("git.build.time"));
-//        } catch (ParseException var4) {
-//            builtTime = Date.from(Instant.EPOCH);
-//        }
+        //        try {
+        //            builtTime = (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")).parse(properties.getProperty("git.build.time"));
+        //        } catch (ParseException var4) {
+        //            builtTime = Date.from(Instant.EPOCH);
+        //        }
 
         return new Version(sdkVersion.getCommit(), sdkVersion.getBuiltTime(),
                 properties.getProperty("git.build.version", UNKNOWN),

diff --git a/target-helm-chart-joke/Chart.yaml b/target-helm-chart-joke/Chart.yaml
@@ -1,4 +1,4 @@
 ---
 name: josdk-generic-helm-chart
-version: 1.0.10-SNAPSHOT
+version: 0.0.1-SNAPSHOT
 apiVersion: v2
diff --git a/target-helm-chart-joke/README.md b/target-helm-chart-joke/README.md
diff --git a/target-helm-chart-joke/templates/cr-cluster-role-binding.yaml b/target-helm-chart-joke/templates/cr-cluster-role-binding.yaml
@@ -8,4 +8,4 @@ roleRef:
   name: josdk-crd-validating-cluster-role
 subjects:
   - kind: ServiceAccount
-    name: quarkus-operator-sdk-samples-joke
+    name: {{ .Chart.Name }}
diff --git a/target-helm-chart-joke/templates/cr-role-bindings.yaml b/target-helm-chart-joke/templates/cr-role-bindings.yaml
@@ -8,4 +8,4 @@ roleRef:
   name: jokerequestreconciler-cluster-role
 subjects:
   - kind: ServiceAccount
-    name: quarkus-operator-sdk-samples-joke
+    name: {{ .Chart.Name }}
diff --git a/target-helm-chart-joke/templates/deployment.yaml b/target-helm-chart-joke/templates/deployment.yaml
@@ -3,29 +3,29 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/managed-by: quarkus
-    app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-    app.kubernetes.io/version: 6.2.2-SNAPSHOT
-  name: quarkus-operator-sdk-samples-joke
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/version: {{ .Values.qosdk.version }}
+  name: {{ .Chart.Name }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-      app.kubernetes.io/version: 6.2.2-SNAPSHOT
+      app.kubernetes.io/name: {{ .Chart.Name }}
+      app.kubernetes.io/version: {{ .Values.qosdk.version }}
   template:
     metadata:
       labels:
         app.kubernetes.io/managed-by: quarkus
-        app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-        app.kubernetes.io/version: 6.2.2-SNAPSHOT
+        app.kubernetes.io/name: {{ .Chart.Name }}
+        app.kubernetes.io/version: {{ .Values.qosdk.version }}
     spec:
       containers:
         - env:
             - name: KUBERNETES_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: csviri/quarkus-operator-sdk-samples-joke:6.2.2-SNAPSHOT
+          image: {{ .Values.image }}
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
@@ -37,7 +37,7 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 10
-          name: quarkus-operator-sdk-samples-joke
+          name: {{ .Chart.Name }}
           ports:
             - containerPort: 8080
               name: http
@@ -62,4 +62,4 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 10
-      serviceAccountName: quarkus-operator-sdk-samples-joke
+      serviceAccountName: {{ .Chart.Name }}
diff --git a/target-helm-chart-joke/templates/generic-crd-cluster-role-binding.yaml b/target-helm-chart-joke/templates/generic-crd-cluster-role-binding.yaml
@@ -8,4 +8,4 @@ roleRef:
   name: josdk-crd-validating-cluster-role
 subjects:
   - kind: ServiceAccount
-    name: quarkus-operator-sdk-samples-joke
+    name: {{ .Chart.Name }}
diff --git a/target-helm-chart-joke/templates/service.yaml b/target-helm-chart-joke/templates/service.yaml
@@ -5,17 +5,17 @@ metadata:
     app.quarkus.io/commit-id: 77d1e2545ac9dd0e6599bffdec4f892cd148984b
     app.quarkus.io/build-timestamp: 2023-07-20 - 11:57:20 +0000
   labels:
-    app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-    app.kubernetes.io/version: 6.2.2-SNAPSHOT
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/version: {{ .Values.qosdk.version }}
     app.kubernetes.io/managed-by: quarkus
-  name: quarkus-operator-sdk-samples-joke
+  name: {{ .Chart.Name }}
 spec:
   ports:
     - name: http
       port: 80
       protocol: TCP
       targetPort: 8080
   selector:
-    app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-    app.kubernetes.io/version: 6.2.2-SNAPSHOT
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/version: {{ .Values.qosdk.version }}
   type: ClusterIP
diff --git a/target-helm-chart-joke/templates/serviceaccount.yaml b/target-helm-chart-joke/templates/serviceaccount.yaml
@@ -3,6 +3,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/managed-by: quarkus
-    app.kubernetes.io/name: quarkus-operator-sdk-samples-joke
-    app.kubernetes.io/version: 6.2.2-SNAPSHOT
-  name: quarkus-operator-sdk-samples-joke
+    app.kubernetes.io/name: {{ .Chart.Name }}
+    app.kubernetes.io/version: {{ .Values.qosdk.version }}
+  name: {{ .Chart.Name }}
diff --git a/target-helm-chart-joke/values.yaml b/target-helm-chart-joke/values.yaml
@@ -1,3 +1,4 @@
-
 qosdk:
   version: 6.2.2-SNAPSHOT
+
+image: csviri/quarkus-operator-sdk-samples-joke:6.2.2-SNAPSHOT