Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 6187fbf

Browse files
author
Thomas
authored
Drop v1beta1 crds for k8s 122 compliance (#1212)
* get rid of CRDs in version v1beta1
1 parent fa431bf commit 6187fbf

File tree

6 files changed

+20
-29
lines changed

6 files changed

+20
-29
lines changed

core/cloudflow-cli/src/main/scala/akka/cli/cloudflow/kubeclient/KubeClientFabric8.scala

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,6 @@ class KubeClientFabric8(
100100
}
101101
}
102102

103-
private def getCrd(name: String, client: KubernetesClient) = {
104-
client
105-
.apiextensions()
106-
.v1beta1()
107-
.customResourceDefinitions()
108-
.inAnyNamespace()
109-
.list()
110-
.getItems()
111-
.asScala
112-
.find { crd =>
113-
val crdName = crd.getMetadata.getName
114-
logger.trace(s"Scanning Custom Resources found: ${name}")
115-
crdName == name
116-
}
117-
}
118-
119103
private def getCloudflowApplicationsClient(client: KubernetesClient) =
120104
Try {
121105
val cloudflowClient = {

core/cloudflow-cli/src/test/scala/akka/cli/cloudflow/kubeclient/Fabric8KubeClientSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Fabric8KubeClientSpec extends AnyFlatSpec with Matchers with BeforeAndAfte
2828
.mkString("\n")
2929

3030
server.expect.get
31-
.withPath("/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions")
31+
.withPath("/apis/apiextensions.k8s.io/v1/customresourcedefinitions")
3232
.andReturn(
3333
HttpURLConnection.HTTP_OK,
3434
Source

core/cloudflow-crd/src/main/scala/akka/datap/crd/App.scala

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ import com.fasterxml.jackson.annotation.JsonProperty
1313
import com.fasterxml.jackson.databind.JsonDeserializer
1414
import com.fasterxml.jackson.databind.JsonNode
1515
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
16-
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionBuilder
16+
import io.fabric8.kubernetes.api.model.apiextensions.v1.{
17+
CustomResourceDefinitionBuilder,
18+
CustomResourceDefinitionVersion,
19+
CustomResourceDefinitionVersionBuilder
20+
}
1721
import io.fabric8.kubernetes.api.model.{ KubernetesResource, Namespaced, ObjectMeta }
1822
import io.fabric8.kubernetes.client.{ CustomResource, CustomResourceList }
1923
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext
2024
import io.fabric8.kubernetes.model.annotation.{ Group, Kind, Plural, Version }
2125

22-
import scala.util.Try
23-
2426
object App {
2527

2628
// GroupName for our CR
@@ -50,6 +52,15 @@ object App {
5052
final val ProtocolVersionKey = "protocol-version"
5153
final val ProtocolVersion = "7"
5254

55+
val customResourceDefinitionVersion: CustomResourceDefinitionVersion = {
56+
new CustomResourceDefinitionVersionBuilder()
57+
.withName(GroupVersion)
58+
.withNewSubresources()
59+
.withNewStatus()
60+
.endStatus()
61+
.endSubresources()
62+
.build()
63+
}
5364
val customResourceDefinitionContext: CustomResourceDefinitionContext =
5465
new CustomResourceDefinitionContext.Builder()
5566
.withVersion(GroupVersion)
@@ -73,13 +84,9 @@ object App {
7384
.withPlural(Plural)
7485
.withShortNames(Short)
7586
.endNames()
76-
.withVersion(GroupVersion)
87+
.withVersions(customResourceDefinitionVersion)
7788
.withScope("Namespaced")
7889
.withPreserveUnknownFields(true)
79-
.withNewSubresources()
80-
.withNewStatus()
81-
.endStatus()
82-
.endSubresources()
8390
.endSpec()
8491
.withNewStatus()
8592
.withStoredVersions(GroupVersion)

core/cloudflow-operator/src/main/scala/cloudflow/operator/Main.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ object Main extends {
129129
Option(
130130
client
131131
.apiextensions()
132-
.v1beta1()
132+
.v1()
133133
.customResourceDefinitions()
134134
.withName(App.ResourceName)
135135
.get()) match {
136-
case Some(crd) if crd.getSpec.getVersion == App.GroupVersion =>
136+
case Some(crd) if crd.getSpec.getVersions().asScala.exists(_.getName == App.GroupVersion) =>
137137
system.log.info(s"CRD found at version ${App.GroupVersion}")
138138
case _ =>
139139
system.log.error(

core/cloudflow-operator/src/main/scala/cloudflow/operator/action/Name.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ object Name {
126126
val ofContainerPrometheusExporterPort = max15Chars("prom-metrics")
127127

128128
def ofService(streamletDeploymentName: String) =
129-
truncateTo63CharactersWithSuffix(makeDNS1039Compatible(ofPod(streamletDeploymentName)), "-service")
129+
truncateTo63CharactersWithSuffix(ofPod(streamletDeploymentName), "-service")
130130

131131
def ofAdminService(streamletDeploymentName: String) =
132132
s"${ofPod(streamletDeploymentName)}-admin-service"

core/tooling/src/main/scala/cli/CodepathCoverageMain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ object CodepathCoverageMain extends App {
143143

144144
Serialization
145145
.jsonMapper()
146-
.readValue("{}", classOf[io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList])
146+
.readValue("{}", classOf[io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList])
147147

148148
Serialization
149149
.jsonMapper()

0 commit comments

Comments
 (0)