Skip to content

Commit

Permalink
Merge pull request #58 from JoshVanL/rename-cert-manager-csi-driver
Browse files Browse the repository at this point in the history
Ensure all names use cert-manager-csi-driver
  • Loading branch information
jetstack-bot authored Sep 14, 2021
2 parents be27e43 + 82ede32 commit 7308f17
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
bin
_artifacts
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ LABEL description="cert-manager CSI Driver"

# Add util-linux to get a new version of losetup.
RUN apk add util-linux
COPY ./bin/cert-manager-csi /cert-manager-csi
ENTRYPOINT ["/cert-manager-csi"]
COPY ./bin/cert-manager-csi-driver /cert-manager-csi-driver
ENTRYPOINT ["/cert-manager-csi-driver"]
2 changes: 1 addition & 1 deletion cmd/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
opts := options.New()

cmd := &cobra.Command{
Use: "cert-manager-csi",
Use: "cert-manager-csi-driver",
Short: helpOutput,
Long: helpOutput,
PreRunE: func(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func main() {
cmd := app.NewCommand(ctx)

if err := cmd.Execute(); err != nil {
klog.ErrorS(err, "error running cert-manager-csi")
klog.ErrorS(err, "error running cert-manager-csi-driver")
os.Exit(1)
}
}
2 changes: 1 addition & 1 deletion test/e2e/suite/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ func TestE2E(t *testing.T) {
ginkgoconfig.GinkgoConfig.ParallelNode))))
}

ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "cert-manager-csi e2e suite", r)
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "cert-manager-csi-driver e2e suite", r)
}
16 changes: 8 additions & 8 deletions test/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set -o pipefail
# Sets up the end-to-end test environment by:
# - creating a kind cluster
# - deploying cert-manager
# - deploying cert-manager-csi
# - deploying cert-manager-csi-driver
# The end-to-end test suite will then be run against this environment.
# The cluster will be deleted after tests have run.

Expand Down Expand Up @@ -79,7 +79,7 @@ fi

export PATH="$BIN_DIR:$PATH"

CLUSTER_NAME="cert-manager-csi-cluster"
CLUSTER_NAME="cert-manager-csi-driver-cluster"
exit_command() {
kind export logs "${ARTIFACTS}" --name="$CLUSTER_NAME"
if [ -z "${SKIP_CLEANUP:-}" ]; then
Expand All @@ -106,19 +106,19 @@ CERT_MANAGER_MANIFEST_URL="https://github.com/jetstack/cert-manager/releases/dow
echo "Installing cert-manager in test cluster using manifest URL '$CERT_MANAGER_MANIFEST_URL'"
kubectl create -f "$CERT_MANAGER_MANIFEST_URL"

echo "Building cert-manager-csi binary"
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -o ./bin/cert-manager-csi ./cmd
echo "Building cert-manager-csi-driver binary"
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -o ./bin/cert-manager-csi-driver ./cmd

CERT_MANAGER_CSI_DOCKER_IMAGE="quay.io/jetstack/cert-manager-csi"
CERT_MANAGER_CSI_DOCKER_IMAGE="quay.io/jetstack/cert-manager-csi-driver"
CERT_MANAGER_CSI_DOCKER_TAG="canary"
echo "Building cert-manager-csi container"
echo "Building cert-manager-csi-driver container"
docker build -t "$CERT_MANAGER_CSI_DOCKER_IMAGE:$CERT_MANAGER_CSI_DOCKER_TAG" .

echo "Loading '$CERT_MANAGER_CSI_DOCKER_IMAGE:$CERT_MANAGER_CSI_DOCKER_TAG' image into kind cluster"
kind load docker-image --name="$CLUSTER_NAME" "$CERT_MANAGER_CSI_DOCKER_IMAGE:$CERT_MANAGER_CSI_DOCKER_TAG"

echo "Deploying cert-manager-csi into test cluster"
./bin/helm upgrade --install -n cert-manager cert-manager-csi ./deploy/charts/csi-driver --set image.repository=$CERT_MANAGER_CSI_DOCKER_IMAGE --set image.tag=$CERT_MANAGER_CSI_DOCKER_TAG
echo "Deploying cert-manager-csi-driver into test cluster"
./bin/helm upgrade --install -n cert-manager cert-manager-csi-driver ./deploy/charts/csi-driver --set image.repository=$CERT_MANAGER_CSI_DOCKER_IMAGE --set image.tag=$CERT_MANAGER_CSI_DOCKER_TAG

echo "Waiting 30s to allow Deployment & DaemonSet controllers to create pods"
sleep 30
Expand Down

0 comments on commit 7308f17

Please sign in to comment.