Merge pull request #90 from mlbiam/main

1.0.38

pom.xml

@@ -5,7 +5,7 @@
   <groupId>io.openunison</groupId>
   <artifactId>openunison-k8s</artifactId>
   <packaging>war</packaging>
-  <version>1.0.37</version>
+  <version>1.0.38</version>
   <name>openunison-k8s</name>
   <url>http://openunison.io</url>
   <repositories>
@@ -20,11 +20,11 @@
   </repositories>
 
   <properties>
-    <openunison.version>1.0.37</openunison.version>
-    <mysql.version>8.0.32</mysql.version>
-    <qpid.version>1.8.0</qpid.version>
-    <sqlserver.version>12.2.0.jre11</sqlserver.version>
-    <postgresql.version>42.6.0</postgresql.version>
+    <openunison.version>1.0.38</openunison.version>
+    <mysql.version>8.0.33</mysql.version>
+    <qpid.version>1.11.0</qpid.version>
+    <sqlserver.version>12.4.2.jre11</sqlserver.version>
+    <postgresql.version>42.7.0</postgresql.version>
     <mariadb.version>3.1.4</mariadb.version>
   </properties>
 
@@ -115,7 +115,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.4.0</version>
         <configuration>
           <from>
             <image>docker.io/tremolosecurity/openunison-jib-builder2:latest</image>

src/main/webapp/WEB-INF/targets/20-k8s.xml

@@ -1,6 +1,6 @@
 <target name="k8s" className="com.tremolosecurity.unison.openshiftv3.OpenShiftTarget">
     <params>
-        <param name="url" value=""/>
+        <param name="url" value="#[K8S_API_SERVER_URL:https://kubernetes.default.svc]"/>
         <param name="userName" value=""/>
         <param name="password" value=""/>
         <param name="token" value=""/>
@@ -9,5 +9,6 @@
         <param name="tokenPath" value="/var/run/secrets/tokens/ou-token" />
         <param name="certPath" value="/var/run/secrets/tokens/ca.crt" />
         <param name="label" value="#[K8S_DEPLOYMENT_NAME:Local Deployment]" />
+        <param name="drqueues" value="#[K8S_DR_QUEUES]" />
     </params>
 </target>

src/main/webapp/WEB-INF/unison.xml

@@ -117,7 +117,7 @@
       <validationQuery>#[OU_JDBC_VALIDATION]</validationQuery>
       <notifier>#[openunison.notifier:default-smtp]</notifier>
     </approvalDB>
-    <org name="Kubernetes Enterprise" description="Kubernetes enterprise deployment" uuid="B158BD40-0C1B-11E3-8FFD-0800200C9A66">
+    <org name="#[openunison.k8s.tree.label:Kubernetes Enterprise]" description="#[openunison.k8s.tree.description:Kubernetes enterprise deployment]" uuid="B158BD40-0C1B-11E3-8FFD-0800200C9A66">
       <dynamicOrgs enabled="true" className="com.tremolosecurity.provisioning.orgs.LoadOrgsFromK8s">
         <params name="k8starget" value="k8s" />
         <params name="namespace" value="#[K8S_OPENUNISON_NS:openunison]" />