Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added support for secure API server build #1749

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions apiserver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ e2e-test: ## Run end to end tests using a pre-exiting cluster.
go test ./test/e2e/... $(GO_TEST_FLAGS) -timeout 60m -race -count=1 -parallel 4

.PHONY: local-e2e-test ## Run end to end tests on newly created cluster.
local-e2e-test: docker-image operator-image cluster load-image load-operator-image deploy-operator deploy load-ray-test-image e2e-test clean-cluster ## Run end to end tests, create a fresh kind cluster will all components deployed.
local-e2e-test: operator-image cluster load-operator-image deploy-operator install load-ray-test-image e2e-test clean-cluster ## Run end to end tests, create a fresh kind cluster will all components deployed.

##@ Testing Setup
KIND_CONFIG ?= hack/kind-cluster-config.yaml
Expand Down Expand Up @@ -147,7 +147,7 @@ ifneq (${OPERATOR_IMAGE_TAG}, latest)
$(ENGINE) pull kuberay/security-proxy:$(OPERATOR_IMAGE_TAG)
endif
$(KIND) load docker-image kuberay/security-proxy:$(OPERATOR_IMAGE_TAG) -n $(KIND_CLUSTER_NAME)

.PHONY: load-ray-test-image
load-ray-test-image: ## Load the ray test images
$(ENGINE) pull $(E2E_API_SERVER_RAY_IMAGE)
Expand All @@ -164,13 +164,22 @@ docker-push: ## Push image for the api server.

##@ Deployment
.PHONY: install
install: kustomize ## Install the kuberay api server to the K8s cluster specified in ~/.kube/config.
cd deploy/local && $(KUSTOMIZE) edit set image kuberay/apiserver=$(IMG)
$(KUSTOMIZE) build deploy/local | kubectl create -f -
install: kustomize docker-image load-image ## Install the kuberay api server to the K8s cluster specified in ~/.kube/config.
cd deploy/local/insecure && $(KUSTOMIZE) edit set image kuberay/apiserver=$(IMG)
$(KUSTOMIZE) build deploy/local/insecure | kubectl create -f -

.PHONY: uninstall
uninstall: ## Install the kuberay api server to the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build deploy/local | kubectl delete -f -
$(KUSTOMIZE) build deploy/local/insecure | kubectl delete -f -

.PHONY: install-secure
install-secure: kustomize docker-image security-proxy-image load-image load-security-proxy-image ## Install the kuberay api server to the K8s cluster specified in ~/.kube/config.
cd deploy/local/secure && $(KUSTOMIZE) edit set image kuberay/apiserver=$(IMG) && $(KUSTOMIZE) edit set image kuberay/security-proxy=kuberay/security-proxy:latest
$(KUSTOMIZE) build deploy/local/secure | kubectl create -f -

.PHONY: uninstall-secure
uninstall-secure: ## Install the kuberay api server to the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build deploy/local/secure | kubectl delete -f -

.PHONY: deploy
deploy: ## Deploy via helm the kuberay api server to the K8s cluster specified in ~/.kube/config.
Expand Down
4 changes: 2 additions & 2 deletions apiserver/deploy/base/secure/apiserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ spec:
httpGet:
path: /healthz
port: http
- name: security-proxy-container
image: quay.io/ibmdpdev/api-server-proxy:secure
- name: kuberay-security-proxy
image: kuberay/security-proxy:nightly
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
3 changes: 3 additions & 0 deletions apiserver/deploy/base/secure/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ images:
- name: kuberay/apiserver
newName: kuberay/apiserver
newTag: nightly
- name: kuberay/security-proxy
newName: kuberay/security-proxy
newTag: nightly
3 changes: 3 additions & 0 deletions apiserver/deploy/local/secure/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ images:
- name: kuberay/apiserver
newName: kuberay/apiserver
newTag: latest
- name: kuberay/security-proxy
newName: kuberay/security-proxy
newTag: latest