From b5e78fb22e2ebf6a50aa5e3677efe05474344ce8 Mon Sep 17 00:00:00 2001 From: Plenty Su Date: Fri, 22 Dec 2023 10:56:09 +0900 Subject: [PATCH] Rename scalar-admin-k8s to scalar-admin-for-kubernetes (#21) --- .github/workflows/e2e.yml | 4 ++-- .github/workflows/release.yml | 2 +- cli/Dockerfile | 2 +- cli/build.gradle | 4 ++-- cli/src/main/java/com/scalar/admin/k8s/Cli.java | 4 ++-- cli/src/main/java/com/scalar/admin/k8s/Result.java | 2 +- .../java/com/scalar/admin/k8s/ZoneIdConverter.java | 2 +- lib/archive.gradle | 10 +++++----- .../main/java/com/scalar/admin/k8s/PausedDuration.java | 2 +- lib/src/main/java/com/scalar/admin/k8s/Pauser.java | 2 +- .../java/com/scalar/admin/k8s/PauserException.java | 2 +- lib/src/main/java/com/scalar/admin/k8s/Product.java | 2 +- .../main/java/com/scalar/admin/k8s/TargetSelector.java | 2 +- .../main/java/com/scalar/admin/k8s/TargetSnapshot.java | 2 +- .../main/java/com/scalar/admin/k8s/TargetStatus.java | 2 +- .../test/java/com/scalar/admin/k8s/ProductTest.java | 2 +- .../java/com/scalar/admin/k8s/TargetSelectorTest.java | 2 +- .../java/com/scalar/admin/k8s/TargetSnapshotTest.java | 2 +- .../java/com/scalar/admin/k8s/TargetStatusTest.java | 2 +- settings.gradle | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bfc75bb..367bf58 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -78,8 +78,8 @@ jobs: - name: Copy Shadow Jar to tester Pod run: | kubectl wait --for=condition=Ready pod/java8 --timeout 300s - kubectl cp cli/build/libs/scalar-admin-k8s-cli-${{ steps.version.outputs.version }}.jar java8:/tmp + kubectl cp cli/build/libs/scalar-admin-for-kubernetes-cli-${{ steps.version.outputs.version }}.jar java8:/tmp - name: Run Shadow Jar run: | - kubectl exec -it java8 -- java -jar /tmp/scalar-admin-k8s-cli-${{ steps.version.outputs.version }}.jar -r foo + kubectl exec -it java8 -- java -jar /tmp/scalar-admin-for-kubernetes-cli-${{ steps.version.outputs.version }}.jar -r foo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e686ab7..4b0c505 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,5 +66,5 @@ jobs: with: context: ./cli push: true - tags: ghcr.io/scalar-labs/scalar-admin-k8s:${{ steps.version.outputs.version }} + tags: ghcr.io/scalar-labs/scalar-admin-for-kubernetes:${{ steps.version.outputs.version }} platforms: linux/amd64,linux/arm64/v8 diff --git a/cli/Dockerfile b/cli/Dockerfile index da2d849..8b10045 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/scalar-labs/jre8:1.1.14 -COPY build/libs/scalar-admin-k8s-cli*.jar /app.jar +COPY build/libs/scalar-admin-for-kubernetes-cli*.jar /app.jar RUN groupadd -r --gid 201 scalar && \ useradd -r --uid 201 -g scalar scalar diff --git a/cli/build.gradle b/cli/build.gradle index 0033339..0984a09 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -9,10 +9,10 @@ dependencies { } shadowJar { - archiveBaseName.set('scalar-admin-k8s-cli') + archiveBaseName.set('scalar-admin-for-kubernetes-cli') archiveClassifier.set('') manifest { - attributes 'Main-Class': 'com.scalar.admin.k8s.Cli' + attributes 'Main-Class': 'com.scalar.admin.kubernetes.Cli' } // this is to merge gRPC service files into the shadow jar diff --git a/cli/src/main/java/com/scalar/admin/k8s/Cli.java b/cli/src/main/java/com/scalar/admin/k8s/Cli.java index 139d0f2..9369caf 100644 --- a/cli/src/main/java/com/scalar/admin/k8s/Cli.java +++ b/cli/src/main/java/com/scalar/admin/k8s/Cli.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,7 +12,7 @@ import picocli.CommandLine.Option; @Command( - name = "scalar-admin-k8s-cli", + name = "scalar-admin-for-kubernetes-cli", description = "Scalar Admin pause tool for the Kubernetes environment") class Cli implements Callable { diff --git a/cli/src/main/java/com/scalar/admin/k8s/Result.java b/cli/src/main/java/com/scalar/admin/k8s/Result.java index 7147215..dfe2f99 100644 --- a/cli/src/main/java/com/scalar/admin/k8s/Result.java +++ b/cli/src/main/java/com/scalar/admin/k8s/Result.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.ZoneId; diff --git a/cli/src/main/java/com/scalar/admin/k8s/ZoneIdConverter.java b/cli/src/main/java/com/scalar/admin/k8s/ZoneIdConverter.java index 02ac6e1..82a59b1 100644 --- a/cli/src/main/java/com/scalar/admin/k8s/ZoneIdConverter.java +++ b/cli/src/main/java/com/scalar/admin/k8s/ZoneIdConverter.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import java.time.ZoneId; import picocli.CommandLine.ITypeConverter; diff --git a/lib/archive.gradle b/lib/archive.gradle index 6d7b268..61ad6cd 100644 --- a/lib/archive.gradle +++ b/lib/archive.gradle @@ -4,12 +4,12 @@ apply plugin: 'signing' publishing { publications { mavenJava(MavenPublication) { - artifactId = 'scalar-admin-k8s' + artifactId = 'scalar-admin-for-Kubernetes' from components.java pom { name = 'Scalar Admin for Kubernetes' description = 'This library provides a pause mechanism to the Scalar products in Kubernetes environments to take transactionally consistent backups.' - url = 'https://github.com/scalar-labs/scalar-admin-k8s' + url = 'https://github.com/scalar-labs/scalar-admin-for-Kubernetes' licenses { license { name = 'Apache License, Version 2.0' @@ -29,9 +29,9 @@ publishing { } } scm { - connection = 'scm:git:https://github.com/scalar-labs/scalar-admin-k8s.git' - developerConnection = 'scm:git:https://github.com/scalar-labs/scalar-admin-k8s.git' - url = 'https://github.com/scalar-labs/scalar-admin-k8s' + connection = 'scm:git:https://github.com/scalar-labs/scalar-admin-for-kubernetes.git' + developerConnection = 'scm:git:https://github.com/scalar-labs/scalar-admin-for-kubernetes.git' + url = 'https://github.com/scalar-labs/scalar-admin-for-kubernetes' } } } diff --git a/lib/src/main/java/com/scalar/admin/k8s/PausedDuration.java b/lib/src/main/java/com/scalar/admin/k8s/PausedDuration.java index 86d7825..9f4a94f 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/PausedDuration.java +++ b/lib/src/main/java/com/scalar/admin/k8s/PausedDuration.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import java.time.Instant; import javax.annotation.concurrent.Immutable; diff --git a/lib/src/main/java/com/scalar/admin/k8s/Pauser.java b/lib/src/main/java/com/scalar/admin/k8s/Pauser.java index a770f6f..51eccc1 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/Pauser.java +++ b/lib/src/main/java/com/scalar/admin/k8s/Pauser.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import com.google.common.util.concurrent.Uninterruptibles; import com.scalar.admin.RequestCoordinator; diff --git a/lib/src/main/java/com/scalar/admin/k8s/PauserException.java b/lib/src/main/java/com/scalar/admin/k8s/PauserException.java index 7ffc0b2..67689ac 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/PauserException.java +++ b/lib/src/main/java/com/scalar/admin/k8s/PauserException.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; public class PauserException extends Exception { public PauserException(String message) { diff --git a/lib/src/main/java/com/scalar/admin/k8s/Product.java b/lib/src/main/java/com/scalar/admin/k8s/Product.java index eb98830..f8394b3 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/Product.java +++ b/lib/src/main/java/com/scalar/admin/k8s/Product.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; enum Product { SCALARDB_SERVER("scalardb", "scalardb"), diff --git a/lib/src/main/java/com/scalar/admin/k8s/TargetSelector.java b/lib/src/main/java/com/scalar/admin/k8s/TargetSelector.java index 75069b2..2edd97a 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/TargetSelector.java +++ b/lib/src/main/java/com/scalar/admin/k8s/TargetSelector.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import io.kubernetes.client.openapi.ApiException; import io.kubernetes.client.openapi.apis.AppsV1Api; diff --git a/lib/src/main/java/com/scalar/admin/k8s/TargetSnapshot.java b/lib/src/main/java/com/scalar/admin/k8s/TargetSnapshot.java index 566e7a9..b5f6355 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/TargetSnapshot.java +++ b/lib/src/main/java/com/scalar/admin/k8s/TargetSnapshot.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import com.google.common.collect.ImmutableList; import io.kubernetes.client.openapi.models.V1Deployment; diff --git a/lib/src/main/java/com/scalar/admin/k8s/TargetStatus.java b/lib/src/main/java/com/scalar/admin/k8s/TargetStatus.java index d4fbc6a..24e24b8 100644 --- a/lib/src/main/java/com/scalar/admin/k8s/TargetStatus.java +++ b/lib/src/main/java/com/scalar/admin/k8s/TargetStatus.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/lib/src/test/java/com/scalar/admin/k8s/ProductTest.java b/lib/src/test/java/com/scalar/admin/k8s/ProductTest.java index 8daab02..c838c45 100644 --- a/lib/src/test/java/com/scalar/admin/k8s/ProductTest.java +++ b/lib/src/test/java/com/scalar/admin/k8s/ProductTest.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/lib/src/test/java/com/scalar/admin/k8s/TargetSelectorTest.java b/lib/src/test/java/com/scalar/admin/k8s/TargetSelectorTest.java index 1324874..2042913 100644 --- a/lib/src/test/java/com/scalar/admin/k8s/TargetSelectorTest.java +++ b/lib/src/test/java/com/scalar/admin/k8s/TargetSelectorTest.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/lib/src/test/java/com/scalar/admin/k8s/TargetSnapshotTest.java b/lib/src/test/java/com/scalar/admin/k8s/TargetSnapshotTest.java index 7659379..6c7544c 100644 --- a/lib/src/test/java/com/scalar/admin/k8s/TargetSnapshotTest.java +++ b/lib/src/test/java/com/scalar/admin/k8s/TargetSnapshotTest.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/lib/src/test/java/com/scalar/admin/k8s/TargetStatusTest.java b/lib/src/test/java/com/scalar/admin/k8s/TargetStatusTest.java index d41263e..c7ff517 100644 --- a/lib/src/test/java/com/scalar/admin/k8s/TargetStatusTest.java +++ b/lib/src/test/java/com/scalar/admin/k8s/TargetStatusTest.java @@ -1,4 +1,4 @@ -package com.scalar.admin.k8s; +package com.scalar.admin.kubernetes; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/settings.gradle b/settings.gradle index b5ad24f..7287c67 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'scalar-admin-k8s' +rootProject.name = 'scalar-admin-for-kubernetes' include 'lib' include 'cli'