Merge branch 'dev' into main

chart/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.1"
+appVersion: "1.1.0"

chart/dev-values.yaml

@@ -0,0 +1,3 @@
+image:
+  pullPolicy: Always
+  tag: "dev"

chart/templates/crd.yaml

@@ -35,7 +35,15 @@ spec:
           type: string
           jsonPath: .spec.object.name
           description: Latest jar file that was tried to be installed.
+        - name: Bucket path
+          type: string
+          jsonPath: .spec.bucket.url_sufix
+          description: Bucket folder where the jar will be downloaded from.
+        - name: Bucket URL
+          type: string
+          jsonPath: .spec.bucket.url
+          description: Bucket URL where the jar will be downloaded from.
         - name: Status
           type: string
-          jsonPath: .status.xp_app_handler/spec
+          jsonPath: .status.xp_app_handler
           description: Jar latest installation status

manifests/dev/crd.yaml

@@ -35,7 +35,15 @@ spec:
           type: string
           jsonPath: .spec.object.name
           description: Latest jar file that was tried to be installed.
+        - name: Bucket path
+          type: string
+          jsonPath: .spec.bucket.url_sufix
+          description: Bucket folder where the jar will be downloaded from.
+        - name: Bucket URL
+          type: string
+          jsonPath: .spec.bucket.url
+          description: Bucket URL where the jar will be downloaded from.
         - name: Status
           type: string
-          jsonPath: .status.xp_app_handler/spec
+          jsonPath: .status.xp_app_handler
           description: Jar latest installation status

manifests/manifest.yaml

@@ -107,9 +107,17 @@ spec:
           type: string
           jsonPath: .spec.object.name
           description: Latest jar file that was tried to be installed.
+        - name: Bucket path
+          type: string
+          jsonPath: .spec.bucket.url_sufix
+          description: Bucket folder where the jar will be downloaded from.
+        - name: Bucket URL
+          type: string
+          jsonPath: .spec.bucket.url
+          description: Bucket URL where the jar will be downloaded from.
         - name: Status
           type: string
-          jsonPath: .status.xp_app_handler/spec
+          jsonPath: .status.xp_app_handler
           description: Jar latest installation status
 
 ---

push_dev

@@ -3,4 +3,4 @@
 docker build . -f Dockerfile -t daviptrs/enonic-operator-k8s:dev --build-arg VERSION_TAG=dev
 docker push daviptrs/enonic-operator-k8s:dev
 
-kubectl rollout restart deployment enonic-op-dev
+kubectl rollout restart deployment enonic-operator

src/init.py

@@ -40,7 +40,7 @@ def installed_xp_app_handler(name, namespace, logger, new, **kwargs):
                 reason="Logging",
                 message=f"{obj_name} installed successfully.",
             )
-            parent.patch({"status": {"xp_app_handler/spec": "Success"}})
+            parent.patch({"status": {"xp_app_handler": "Success"}})
             job = pk.Job.objects(api, namespace=namespace).get_by_name(name)
             job.delete(propagation_policy="Foreground")
         else:
@@ -52,7 +52,7 @@ def installed_xp_app_handler(name, namespace, logger, new, **kwargs):
                     reason="Logging",
                     message=f"{obj_name} could not be installed.",
                 )
-                parent.patch({"status": {"xp_app_handler/spec": "Failure"}})
+                parent.patch({"status": {"xp_app_handler": "Failure"}})
                 logger.error(f"{namespace}/{name} job is failing. Check the logs!")
         api.session.close()