Skip to content

Commit

Permalink
Rename scalar-admin-k8s to scalar-admin-for-kubernetes (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
supl authored Dec 22, 2023
1 parent 3e69443 commit b5e78fb
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cli/src/main/java/com/scalar/admin/k8s/Cli.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<Integer> {

Expand Down
2 changes: 1 addition & 1 deletion cli/src/main/java/com/scalar/admin/k8s/Result.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.ZoneId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

import java.time.ZoneId;
import picocli.CommandLine.ITypeConverter;
Expand Down
10 changes: 5 additions & 5 deletions lib/archive.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/PausedDuration.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

import java.time.Instant;
import javax.annotation.concurrent.Immutable;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/Pauser.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

public class PauserException extends Exception {
public PauserException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/Product.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

enum Product {
SCALARDB_SERVER("scalardb", "scalardb"),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/TargetSelector.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/TargetSnapshot.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/scalar/admin/k8s/TargetStatus.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

import com.google.common.collect.ImmutableMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/test/java/com/scalar/admin/k8s/ProductTest.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.scalar.admin.k8s;
package com.scalar.admin.kubernetes;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rootProject.name = 'scalar-admin-k8s'
rootProject.name = 'scalar-admin-for-kubernetes'
include 'lib'
include 'cli'

0 comments on commit b5e78fb

Please sign in to comment.