Skip to content

Commit 69d5765

Browse files
committed
Update Kotlin and general fixes
1 parent d8829ca commit 69d5765

4 files changed

Lines changed: 6 additions & 18 deletions

File tree

.github/workflows/workflows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
java: [ 11 ]
12-
kubernetes: [ 'v1.19.6', 'v1.18.14', 'v1.17.16', 'v1.16.14']
12+
kubernetes: [ '1.21.4', '1.20.10', 'v1.19.14', 'v1.18.20', 'v1.17.17', 'v1.16.15']
1313

1414
steps:
1515
- uses: actions/checkout@v2

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<maven.compiler.release>11</maven.compiler.release>
1919
<maven.compiler.target>11</maven.compiler.target>
2020
<version.fabric8.client>4.13.2</version.fabric8.client>
21-
<kotlin.version>1.4.10</kotlin.version>
21+
<kotlin.version>1.5.21</kotlin.version>
2222
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
2323
<version.arquillian_cube>1.18.2</version.arquillian_cube>
2424
<junit.jupiter.version>5.6.0</junit.jupiter.version>
@@ -140,6 +140,8 @@
140140
</executions>
141141
<configuration>
142142
<jvmTarget>11</jvmTarget>
143+
<languageVersion>1.5</languageVersion>
144+
<apiVersion>1.5</apiVersion>
143145
</configuration>
144146
</plugin>
145147
<plugin>

src/main/kotlin/eu/openanalytics/shinyproxyoperator/Operator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ class Operator(client: NamespacedKubernetesClient? = null,
136136
serviceInformer = informerFactory.sharedIndexInformerFor(Service::class.java, ServiceList::class.java, 10 * 60 * 1000.toLong())
137137
configMapInformer = informerFactory.sharedIndexInformerFor(ConfigMap::class.java, ConfigMapList::class.java, 10 * 60 * 1000.toLong())
138138
ingressInformer = informerFactory.sharedIndexInformerFor(Ingress::class.java, IngressList::class.java, 10 * 60 * 1000.toLong())
139-
shinyProxyInformer = informerFactory.sharedIndexInformerForCustomResource(podSetCustomResourceDefinitionContext, ShinyProxy::class.java, ShinyProxyList::class.java, 10 * 60 * 1000)
139+
shinyProxyInformer = informerFactory.sharedIndexInformerForCustomResource(podSetCustomResourceDefinitionContext, ShinyProxy::class.java, ShinyProxyList::class.java, 10 * 60 * 1000.toLong())
140140
podRetriever = PodRetriever(this.client)
141141
} else {
142142
val operationContext = OperationContext().withNamespace(namespace)
143143
replicaSetInformer = informerFactory.sharedIndexInformerFor(ReplicaSet::class.java, ReplicaSetList::class.java, operationContext, 10 * 60 * 1000.toLong())
144144
serviceInformer = informerFactory.sharedIndexInformerFor(Service::class.java, ServiceList::class.java, operationContext, 10 * 60 * 1000.toLong())
145145
configMapInformer = informerFactory.sharedIndexInformerFor(ConfigMap::class.java, ConfigMapList::class.java, operationContext, 10 * 60 * 1000.toLong())
146146
ingressInformer = informerFactory.sharedIndexInformerFor(Ingress::class.java, IngressList::class.java, operationContext, 10 * 60 * 1000.toLong())
147-
shinyProxyInformer = informerFactory.sharedIndexInformerForCustomResource(podSetCustomResourceDefinitionContext, ShinyProxy::class.java, ShinyProxyList::class.java, operationContext, 10 * 60 * 1000)
147+
shinyProxyInformer = informerFactory.sharedIndexInformerForCustomResource(podSetCustomResourceDefinitionContext, ShinyProxy::class.java, ShinyProxyList::class.java, operationContext, 10 * 60 * 1000.toLong())
148148
podRetriever = PodRetriever(this.client)
149149
}
150150

src/test/resources/arquillian.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)