Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): update dependency io.javaoperatorsdk:operator-framework to v4.3.1 #119

Merged
merged 2 commits into from
May 9, 2023
Merged

fix(deps): update dependency io.javaoperatorsdk:operator-framework to v4.3.1 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eede553
fix(deps): update dependency io.javaoperatorsdk:operator-framework to…
renovate[bot] May 9, 2023
30f3060
build: fix compile errors caused by dependency update
kosmoz May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=0.4.6-SNAPSHOT
javaOperatorVersion=4.2.8
javaOperatorVersion=4.3.1
crdGeneratorVersion=6.4.1
slf4jVersion=2.0.7
logbackVersion=1.4.7
Expand Down
29 changes: 29 additions & 0 deletions operator/src/main/kotlin/eu/glasskube/kubernetes/api/model/Creators.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimVolumeSource
import io.fabric8.kubernetes.api.model.PodSpec
import io.fabric8.kubernetes.api.model.PodTemplateSpec
import io.fabric8.kubernetes.api.model.Quantity
import io.fabric8.kubernetes.api.model.ResourceClaim
import io.fabric8.kubernetes.api.model.ResourceRequirements
import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder
import io.fabric8.kubernetes.api.model.Secret
import io.fabric8.kubernetes.api.model.SecretEnvSource
import io.fabric8.kubernetes.api.model.SecretKeySelector
Expand Down Expand Up @@ -88,6 +91,32 @@ inline fun Service.spec(block: (@KubernetesDslMarker ServiceSpec).() -> Unit) {
inline fun servicePort(block: (@KubernetesDslMarker ServicePort).() -> Unit) =
ServicePort().apply(block)

inline fun Container.resources(block: (@KubernetesDslMarker ResourceRequirementsBuilder).() -> Unit) {
resources = ResourceRequirementsBuilder().apply(block).build()
}

fun ResourceRequirementsBuilder.requests(cpu: Quantity? = null, memory: Quantity? = null) {
if (cpu != null) {
addToRequests("cpu", cpu)
}
if (memory != null) {
addToRequests("memory", memory)
}
}

fun ResourceRequirementsBuilder.limits(cpu: Quantity? = null, memory: Quantity? = null) {
if (cpu != null) {
addToLimits("cpu", cpu)
}
if (memory != null) {
addToLimits("memory", memory)
}
}

fun ResourceRequirementsBuilder.claims(vararg claims: String) {
addAllToClaims(claims.map { ResourceClaim(it) })
}

inline fun Container.envFrom(block: (@KubernetesDslMarker MutableList<EnvFromSource>).() -> Unit) {
envFrom = mutableListOf<EnvFromSource>().apply(block)
}
Expand Down
2 changes: 1 addition & 1 deletion operator/src/main/kotlin/eu/glasskube/kubernetes/client/Ext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ fun <S, T : CustomResource<*, S>> T.patchOrUpdateResourceAndStatus(desiredStatus
when (status) {
null -> UpdateControl.updateResourceAndStatus(apply { status = desiredStatus })
desiredStatus -> UpdateControl.updateResource(this)
else -> UpdateControl.patchResourceAndStatus(apply { status = desiredStatus })
else -> UpdateControl.updateResourceAndPatchStatus(apply { status = desiredStatus })
}
12 changes: 7 additions & 5 deletions operator/src/main/kotlin/eu/glasskube/operator/gitea/dependent/GiteaDeployment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ import eu.glasskube.kubernetes.api.model.env
import eu.glasskube.kubernetes.api.model.envFrom
import eu.glasskube.kubernetes.api.model.envVar
import eu.glasskube.kubernetes.api.model.intOrString
import eu.glasskube.kubernetes.api.model.limits
import eu.glasskube.kubernetes.api.model.metadata
import eu.glasskube.kubernetes.api.model.persistentVolumeClaim
import eu.glasskube.kubernetes.api.model.requests
import eu.glasskube.kubernetes.api.model.resources
import eu.glasskube.kubernetes.api.model.secretKeyRef
import eu.glasskube.kubernetes.api.model.secretRef
import eu.glasskube.kubernetes.api.model.spec
Expand All @@ -36,7 +39,6 @@ import io.fabric8.kubernetes.api.model.HTTPGetAction
import io.fabric8.kubernetes.api.model.IntOrString
import io.fabric8.kubernetes.api.model.Probe
import io.fabric8.kubernetes.api.model.Quantity
import io.fabric8.kubernetes.api.model.ResourceRequirements
import io.fabric8.kubernetes.api.model.SecurityContext
import io.fabric8.kubernetes.api.model.apps.Deployment
import io.javaoperatorsdk.operator.api.reconciler.Context
Expand Down Expand Up @@ -76,10 +78,10 @@ class GiteaDeployment : CRUDKubernetesDependentResource<Deployment, Gitea>(Deplo
container {
name = "gitea"
image = IMAGE
resources = ResourceRequirements(
mapOf("memory" to Quantity("300", "Mi")),
mapOf("memory" to Quantity("200", "Mi"))
)
resources {
limits(memory = Quantity("300", "Mi"))
requests(memory = Quantity("200", "Mi"))
}
ports = listOf(
containerPort {
name = "http"
Expand Down
12 changes: 7 additions & 5 deletions operator/src/main/kotlin/eu/glasskube/operator/gitea/dependent/GiteaRedisDeployment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ import eu.glasskube.kubernetes.api.model.apps.spec
import eu.glasskube.kubernetes.api.model.apps.template
import eu.glasskube.kubernetes.api.model.container
import eu.glasskube.kubernetes.api.model.containerPort
import eu.glasskube.kubernetes.api.model.limits
import eu.glasskube.kubernetes.api.model.metadata
import eu.glasskube.kubernetes.api.model.requests
import eu.glasskube.kubernetes.api.model.resources
import eu.glasskube.kubernetes.api.model.spec
import eu.glasskube.operator.gitea.Gitea
import eu.glasskube.operator.gitea.GiteaReconciler
import eu.glasskube.operator.gitea.redisLabelSelector
import eu.glasskube.operator.gitea.redisLabels
import eu.glasskube.operator.gitea.redisName
import io.fabric8.kubernetes.api.model.Quantity
import io.fabric8.kubernetes.api.model.ResourceRequirements
import io.fabric8.kubernetes.api.model.apps.Deployment
import io.javaoperatorsdk.operator.api.reconciler.Context
import io.javaoperatorsdk.operator.api.reconciler.ResourceIDMatcherDiscriminator
Expand Down Expand Up @@ -48,10 +50,10 @@ class GiteaRedisDeployment : CRUDKubernetesDependentResource<Deployment, Gitea>(
container {
name = "redis"
image = "redis:${Gitea.REDIS_VERSION}-alpine"
resources = ResourceRequirements(
mapOf("memory" to Quantity("128", "Mi")),
mapOf("memory" to Quantity("10", "Mi"))
)
resources {
limits(memory = Quantity("128", "Mi"))
requests(memory = Quantity("10", "Mi"))
}
ports = listOf(
containerPort { containerPort = 6379 }
)
Expand Down
8 changes: 6 additions & 2 deletions operator/src/main/kotlin/eu/glasskube/operator/minio/dependent/MinioBucketSecret.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import eu.glasskube.operator.minio.genericResourceName
import eu.glasskube.operator.minio.resourceLabels
import io.fabric8.kubernetes.api.model.Secret
import io.javaoperatorsdk.operator.api.reconciler.Context
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition

Expand All @@ -22,7 +23,10 @@ class MinioBucketSecret : GeneratedSecret<MinioBucket>() {
private val MinioBucket.defaultUsername get() = bucketName

class ReconcilePrecondition : Condition<Secret, MinioBucket> {
override fun isMet(primary: MinioBucket, secondary: Secret?, context: Context<MinioBucket>?) =
primary.spec.userSecret == null
override fun isMet(
dependentResource: DependentResource<Secret, MinioBucket>,
primary: MinioBucket,
context: Context<MinioBucket>
) = primary.spec.userSecret == null
}
}