Skip to content

Commit f567992

Browse files
committed
Ref #32454: use forceConflicts for SSA
1 parent 6989255 commit f567992

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ConfigMapFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ConfigMapFactory(private val kubeClient: KubernetesClient) {
5555
.addToData("application.yml", shinyProxy.specAsYaml)
5656
.build()
5757
//@formatter:on
58-
val createdConfigMap = kubeClient.configMaps().inNamespace(shinyProxy.metadata.namespace).resource(configMapDefinition).serverSideApply()
58+
val createdConfigMap = kubeClient.configMaps().inNamespace(shinyProxy.metadata.namespace).resource(configMapDefinition).forceConflicts().serverSideApply()
5959
logger.debug { "${shinyProxy.logPrefix(shinyProxyInstance)} [Component/ConfigMap] Created ${createdConfigMap.metadata.name}" }
6060
}
6161

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/IngressFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
7171
//@formatter:on
7272

7373
val patchedIngress = ingressPatcher.patch(ingressDefinition, shinyProxy.parsedIngressPatches)
74-
val createdIngress = kubeClient.network().v1().ingresses().inNamespace(shinyProxy.metadata.namespace).resource(patchedIngress).serverSideApply()
74+
val createdIngress = kubeClient.network().v1().ingresses().inNamespace(shinyProxy.metadata.namespace).resource(patchedIngress).forceConflicts().serverSideApply()
7575
logger.debug { "${shinyProxy.logPrefix()} [Component/Ingress] Created ${createdIngress.metadata.name}" }
7676
}
7777

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ReplicaSetFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ReplicaSetFactory(private val kubeClient: KubernetesClient) {
5858
.build()
5959
//@formatter:on
6060

61-
val createdReplicaSet = kubeClient.apps().replicaSets().inNamespace(shinyProxy.metadata.namespace).resource(replicaSetDefinition).serverSideApply()
61+
val createdReplicaSet = kubeClient.apps().replicaSets().inNamespace(shinyProxy.metadata.namespace).resource(replicaSetDefinition).forceConflicts().serverSideApply()
6262
logger.debug { "${shinyProxy.logPrefix(shinyProxyInstance)} [Component/ReplicaSet] Created ${createdReplicaSet.metadata.name}" }
6363
}
6464

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ServiceFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ServiceFactory(private val serviceClient: MixedOperation<Service, ServiceL
6666
//@formatter:on
6767

6868
val patchedService = servicePatcher.patch(serviceDefinition, shinyProxy.parsedServicePatches)
69-
val createdService = serviceClient.inNamespace(shinyProxy.metadata.namespace).resource(patchedService).serverSideApply()
69+
val createdService = serviceClient.inNamespace(shinyProxy.metadata.namespace).resource(patchedService).forceConflicts().serverSideApply()
7070
logger.debug { "${shinyProxy.logPrefix(latestShinyProxyInstance)} [Component/Service] Created ${createdService.metadata.name}" }
7171
}
7272

0 commit comments

Comments
 (0)