From f3338a6d6fb260f01bc9e515858c3eac9b4a876d Mon Sep 17 00:00:00 2001 From: Jesus Zazueta Date: Sun, 25 Aug 2024 16:12:54 -0400 Subject: [PATCH] - Patch version bump. --- .github/workflows/main.yml | 2 +- bl-k8s-test/src/test/java/BlKubeRtTest.java | 4 +- .../src/test/java/BlTestManifests.java | 39 ------------------- build.gradle.kts | 2 +- 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 455587b..f7583fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: fi - name: Build bl-k8s-rt if: env.BL_COMMON_PROJECTS_MODIFIED == 'true' - run: gradle :bl-k8s-rt:build + run: gradle :bl-codegen:build :bl-k8s-rt:build :io.vacco.beleth.gradle.plugin:build env: SONATYPE_USER: ${{secrets.SONATYPE_USER}} SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} diff --git a/bl-k8s-test/src/test/java/BlKubeRtTest.java b/bl-k8s-test/src/test/java/BlKubeRtTest.java index 709860b..2f14f88 100644 --- a/bl-k8s-test/src/test/java/BlKubeRtTest.java +++ b/bl-k8s-test/src/test/java/BlKubeRtTest.java @@ -26,9 +26,7 @@ public class BlKubeRtTest { if (add) { rt .add(BlTestManifests.nameSpace) - .add(BlTestManifests.serviceAccount) - .add(BlTestManifests.clusterRoleAggregatedMetricsReader) - .add(BlTestManifests.clusterRoleMetricsServer); + .add(BlTestManifests.serviceAccount); } var pkg = "io.gopher.test"; diff --git a/bl-k8s-test/src/test/java/BlTestManifests.java b/bl-k8s-test/src/test/java/BlTestManifests.java index 00710f1..449a392 100644 --- a/bl-k8s-test/src/test/java/BlTestManifests.java +++ b/bl-k8s-test/src/test/java/BlTestManifests.java @@ -1,13 +1,8 @@ import io.k8s.api.core.v1.Namespace; import io.k8s.api.core.v1.ServiceAccount; -import io.k8s.api.rbac.v1.ClusterRole; - -import java.util.List; import static io.k8s.api.core.v1.Namespace.namespace; import static io.k8s.api.core.v1.ServiceAccount.serviceAccount; -import static io.k8s.api.rbac.v1.ClusterRole.clusterRole; -import static io.k8s.api.rbac.v1.PolicyRule.policyRule; import static io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.objectMeta; import static io.k8s.apimachinery.pkg.apis.meta.v1.objectmeta.Labels.labels; @@ -34,38 +29,4 @@ public class BlTestManifests { .labels(labels().kv("k8s-app", "momo-server")) ); - public static final ClusterRole clusterRoleAggregatedMetricsReader = clusterRole() - .apiVersion("rbac.authorization.k8s.io/v1") - .kind("ClusterRole") - .metadata( - objectMeta() - .name("momo-metrics-reader") - .labels(labels().kv("k8s-app", "momo-server")) - ) - .rules(List.of( - policyRule() - .apiGroups(List.of("metrics.k8s.io")) - .resources(List.of("pods", "nodes")) - .verbs(List.of("get", "list", "watch")) - )); - - public static final ClusterRole clusterRoleMetricsServer = clusterRole() - .apiVersion("rbac.authorization.k8s.io/v1") - .kind("ClusterRole") - .metadata( - objectMeta() - .name("momo-metrics-server") - .labels(labels().kv("k8s-app", "momo-server")) - ) - .rules(List.of( - policyRule() - .apiGroups(List.of("")) - .resources(List.of("nodes/metrics")) - .verbs(List.of("get")), - policyRule() - .apiGroups(List.of("")) - .resources(List.of("pods", "nodes")) - .verbs(List.of("get", "list", "watch")) - )); - } diff --git a/build.gradle.kts b/build.gradle.kts index 2e865a2..efcb572 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("io.vacco.oss.gitflow") version "1.0.1" apply(false) } subprojects { apply(plugin = "io.vacco.oss.gitflow") group = "io.vacco.beleth" - version = "0.4.2" + version = "0.4.3" configure { sharedLibrary(true, false)