Skip to content

Commit

Permalink
Add in ci for cert generation image
Browse files Browse the repository at this point in the history
  • Loading branch information
JPinkney committed Jun 16, 2020
1 parent a189e87 commit dc2e24d
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 202 deletions.
1 change: 1 addition & 0 deletions .cico/cico_build_master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ export SCRIPT_DIR
load_jenkins_vars
install_deps
build_and_push ./build che-workspace-controller
build_and_push ./cert-generation che-workspace-controller-cert-gen
1 change: 1 addition & 0 deletions .cico/cico_build_nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ install_deps

set_nightly_tag
build_and_push ./build che-workspace-controller
build_and_push ./cert-generation che-workspace-controller-cert-gen
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,4 @@ help: Makefile
@echo ' ADMIN_CTX - Kubectx entry that should be used during work with cluster. The current will be used if omitted'
@echo ' REGISTRY_ENABLED - Whether the plugin registry should be deployed'
@echo ' DEVWORKSPACE_API_VERSION - Branch or tag of the github.com/devfile/kubernetes-api to depend on. Defaults to master'
@echo ' CERT_IMG - The name of the cert generator image'
@echo ' CERT_IMG - The name of the cert generator image'
2 changes: 1 addition & 1 deletion cert-generation/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func main() {
}

// Wait until it's cleaned up by the workspace-controller
log.Println("I've done my work and waiting to be utilized. Don't feel sorry for me I was initially designed to die if everything is fine")
log.Println("Certs have been successfully created. Waiting to be cleaned up by devworkspace controller")
for {
}
}
197 changes: 0 additions & 197 deletions pkg/webhook/server/webhook_cert_init.go

This file was deleted.

6 changes: 3 additions & 3 deletions pkg/webhook/workspace/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"fmt"
"os"

"github.com/che-incubator/che-workspace-operator/pkg/config"
"github.com/devfile/devworkspace-operator/pkg/config"
corev1 "k8s.io/api/core/v1"

appsv1 "k8s.io/api/apps/v1"

"github.com/che-incubator/che-workspace-operator/internal/controller"
"github.com/che-incubator/che-workspace-operator/pkg/webhook/server"
"github.com/devfile/devworkspace-operator/internal/controller"
"github.com/devfile/devworkspace-operator/pkg/webhook/server"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"k8s.io/api/admissionregistration/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down

0 comments on commit dc2e24d

Please sign in to comment.