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

Drop v1beta1 crds for k8s 122 compliance #1212

Merged
franciscolopezsancho merged 9 commits into from
Aug 8, 2022
Merged

Drop v1beta1 crds for k8s 122 compliance #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
688b570
Drop unnecessary object name conversion
Jan 12, 2021
8dfedf9
Avoid code duplication for building k8s service-name based on app-id …
Jan 12, 2021
47289fd
Add specs for reproducing unexpected behavior
May 21, 2021
c9ad68d
Revert "Add specs for reproducing unexpected behavior"
May 21, 2021
220519d
Update from main
Aug 19, 2021
94f6a87
Merge branch 'lightbend:main' into master
thomasschoeftner Jun 29, 2022
b43ca31
Merge branch 'lightbend:main' into master
thomasschoeftner Jun 30, 2022
becfaac
Try to get rid of CRDs in version v1beta1
Jul 2, 2022
340d5f8
Fix incorrect check whether version is contained
Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions core/cloudflow-cli/src/main/scala/akka/cli/cloudflow/kubeclient/KubeClientFabric8.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,6 @@ class KubeClientFabric8(
}
}

private def getCrd(name: String, client: KubernetesClient) = {
client
.apiextensions()
.v1beta1()
.customResourceDefinitions()
.inAnyNamespace()
.list()
.getItems()
.asScala
.find { crd =>
val crdName = crd.getMetadata.getName
logger.trace(s"Scanning Custom Resources found: ${name}")
crdName == name
}
}

private def getCloudflowApplicationsClient(client: KubernetesClient) =
Try {
val cloudflowClient = {
Expand Down
2 changes: 1 addition & 1 deletion core/cloudflow-cli/src/test/scala/akka/cli/cloudflow/kubeclient/Fabric8KubeClientSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Fabric8KubeClientSpec extends AnyFlatSpec with Matchers with BeforeAndAfte
.mkString("\n")

server.expect.get
.withPath("/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions")
.withPath("/apis/apiextensions.k8s.io/v1/customresourcedefinitions")
.andReturn(
HttpURLConnection.HTTP_OK,
Source
Expand Down
23 changes: 15 additions & 8 deletions core/cloudflow-crd/src/main/scala/akka/datap/crd/App.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.JsonDeserializer
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionBuilder
import io.fabric8.kubernetes.api.model.apiextensions.v1.{
CustomResourceDefinitionBuilder,
CustomResourceDefinitionVersion,
CustomResourceDefinitionVersionBuilder
}
import io.fabric8.kubernetes.api.model.{ KubernetesResource, Namespaced, ObjectMeta }
import io.fabric8.kubernetes.client.{ CustomResource, CustomResourceList }
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext
import io.fabric8.kubernetes.model.annotation.{ Group, Kind, Plural, Version }

import scala.util.Try

object App {

// GroupName for our CR
Expand Down Expand Up @@ -50,6 +52,15 @@ object App {
final val ProtocolVersionKey = "protocol-version"
final val ProtocolVersion = "7"

val customResourceDefinitionVersion: CustomResourceDefinitionVersion = {
new CustomResourceDefinitionVersionBuilder()
.withName(GroupVersion)
Comment thread
thomasschoeftner marked this conversation as resolved.
.withNewSubresources()
.withNewStatus()
.endStatus()
Comment thread
franciscolopezsancho marked this conversation as resolved.
.endSubresources()
.build()
}
val customResourceDefinitionContext: CustomResourceDefinitionContext =
new CustomResourceDefinitionContext.Builder()
.withVersion(GroupVersion)
Expand All @@ -73,13 +84,9 @@ object App {
.withPlural(Plural)
.withShortNames(Short)
.endNames()
.withVersion(GroupVersion)
.withVersions(customResourceDefinitionVersion)
.withScope("Namespaced")
.withPreserveUnknownFields(true)
.withNewSubresources()
Comment thread
thomasschoeftner marked this conversation as resolved.
.withNewStatus()
.endStatus()
.endSubresources()
.endSpec()
.withNewStatus()
.withStoredVersions(GroupVersion)
Expand Down
4 changes: 2 additions & 2 deletions core/cloudflow-operator/src/main/scala/cloudflow/operator/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ object Main extends {
Option(
client
.apiextensions()
.v1beta1()
.v1()
.customResourceDefinitions()
.withName(App.ResourceName)
.get()) match {
case Some(crd) if crd.getSpec.getVersion == App.GroupVersion =>
case Some(crd) if crd.getSpec.getVersions().asScala.exists(_.getName == App.GroupVersion) =>
system.log.info(s"CRD found at version ${App.GroupVersion}")
case _ =>
system.log.error(
Expand Down
2 changes: 1 addition & 1 deletion core/cloudflow-operator/src/main/scala/cloudflow/operator/action/Name.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ object Name {
val ofContainerPrometheusExporterPort = max15Chars("prom-metrics")

def ofService(streamletDeploymentName: String) =
truncateTo63CharactersWithSuffix(makeDNS1039Compatible(ofPod(streamletDeploymentName)), "-service")
truncateTo63CharactersWithSuffix(ofPod(streamletDeploymentName), "-service")

def ofAdminService(streamletDeploymentName: String) =
s"${ofPod(streamletDeploymentName)}-admin-service"
Expand Down
2 changes: 1 addition & 1 deletion core/tooling/src/main/scala/cli/CodepathCoverageMain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ object CodepathCoverageMain extends App {

Serialization
.jsonMapper()
.readValue("{}", classOf[io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList])
.readValue("{}", classOf[io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList])

Serialization
.jsonMapper()
Expand Down