⬆️ Next version 4.1.1-SNAPSHOT (#408)

* Enhance CSV format creation * Set new snapshot version * Set new snapshot version
project-openubl · Nov 18, 2022 · 731d6d4 · 731d6d4
1 parent 4baf0fa
commit 731d6d4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,9 +29,9 @@ jobs:
           cache: maven
       - name: Set release version ${{ github.event.inputs.version }}
         run: |
-          mvn -B versions:set versions:commit -DnewVersion=$RELEASE_VERSION
+          mvn -B versions:set versions:commit -DnewVersion=$NEW_VERSION
         env:
-          RELEASE_VERSION: ${{ github.event.inputs.version }}
+          NEW_VERSION: ${{ github.event.inputs.version }}
       - name: Commit and Push
         uses: project-openubl/.github/actions/commit@master
         with:
@@ -134,6 +134,7 @@ jobs:
           -Dquarkus.container-image.tag=latest \
           -Dquarkus.operator-sdk.bundle.package-name=searchpe-operator \
           -Dquarkus.operator-sdk.bundle.channels=alpha \
+          -Doperator.searchpe.image=quay.io/projectopenubl/searchpe:v${{ github.event.inputs.version }} \
           -P native \
           -f operator
 
@@ -144,7 +145,7 @@ jobs:
           docker image push --all-tags quay.io/projectopenubl/searchpe-operator
 
   publish-operator:
-    if: ${{ github.event.inputs.skip_publish_operator != true }}
+    if: ${{ github.event.inputs.skip_publish_operator == false }}
     needs: [ operator ]
     runs-on: ubuntu-latest
     steps:
@@ -163,6 +164,7 @@ jobs:
           sudo apt-get install -y groovy
 
           mvn package -DskipTests \
+          -Doperator.searchpe.image=quay.io/projectopenubl/searchpe:v${{ github.event.inputs.version }} \
           -Dquarkus.operator-sdk.bundle.package-name=searchpe-operator \
           -Dquarkus.operator-sdk.bundle.channels=alpha \
           -f operator
@@ -226,6 +228,11 @@ jobs:
           name: jreleaser-log
           path: 'jreleaser-log.tgz'
 
+      - name: Set version ${{ github.event.inputs.next }}
+        run: |
+          mvn -B versions:set versions:commit -DnewVersion=$NEW_VERSION
+        env:
+          NEW_VERSION: ${{ github.event.inputs.next }}
       - name: Commit and Push
         uses: project-openubl/.github/actions/commit@master
         with:

diff --git a/application/pom.xml b/application/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.github.project-openubl</groupId>
         <artifactId>searchpe-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/operator/pom.xml b/operator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.github.project-openubl</groupId>
         <artifactId>searchpe-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/operator/src/main/java/io/github/project/openubl/operator/SearchpeOperatorCSVMetadata.java b/operator/src/main/java/io/github/project/openubl/operator/SearchpeOperatorCSVMetadata.java
@@ -28,20 +28,27 @@
                 categories = "Application Runtime",
                 capabilities = "Basic Install",
                 almExamples = """
-                        kind: "Searchpe"
-                        apiVersion: "searchpe.openubl.io/v1alpha1"
-                        metadata:
-                          name: searchpe
-                        spec:
-                          db:
-                            usernameSecret:
-                              name: postgresql-pguser-foo
-                              key: user
-                            passwordSecret:
-                              name: postgresql-pguser-foo
-                              key: password
-                            url: jdbc:postgresql://postgresql-primary.default.svc:5432/searchpedb
-                        """
+                [{
+                  "kind": "Searchpe",
+                  "apiVersion": "searchpe.openubl.io/v1alpha1",
+                  "metadata": {
+                    "name": "searchpe"
+                  },
+                  "spec": {
+                    "db": {
+                      "usernameSecret": {
+                        "name": "postgresql-pguser-foo",
+                        "key": "user"
+                      },
+                      "passwordSecret": {
+                        "name": "postgresql-pguser-foo",
+                        "key": "password"
+                      },
+                      "url": "jdbc:postgresql://postgresql-primary.default.svc:5432/searchpedb"
+                    }
+                  }
+                }]
+                """
         ),
         permissionRules = {
                 @CSVMetadata.PermissionRule(

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>io.github.project-openubl</groupId>
     <artifactId>searchpe-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1-SNAPSHOT</version>
     <description>Procesa y almacena el Padrón reducido RUC de la SUNAT y lo expone para su consumo a travéz de su UI y servicios REST</description>
     <packaging>pom</packaging>
 

diff --git a/scripts/enrichCSV.groovy b/scripts/enrichCSV.groovy
@@ -28,6 +28,8 @@ yaml.metadata.name = 'searchpe-operator.v' + version
 yaml.spec.annotations.containerImage = 'quay.io/projectopenubl/searchpe-operator:v' + version
 yaml.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = 'quay.io/projectopenubl/searchpe-operator:v' + version
 yaml.spec.version = version
+yaml.spec.customresourcedefinitions.owned[0].displayName = 'Searchpe'
+yaml.spec.customresourcedefinitions.owned[0].description = 'Searchpe'
 
 // Workaround for moving annotations since OperatorHub.io complains about it
 yaml.metadata.annotations = yaml.spec.annotations
@@ -37,5 +39,6 @@ DumperOptions options = new DumperOptions();
 options.indent = 2
 options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
 options.defaultScalarStyle = DumperOptions.ScalarStyle.PLAIN
+options.prettyFlow = true
 
 new Yaml(options).dump(yaml, new FileWriter(file))