Skip to content

Commit

Permalink
[Manifest] Cache - Fix upgrade manifest (kubeflow#3338)
Browse files Browse the repository at this point in the history
* Initial execution cache

This commit adds initial execution cache service. Including http service
and execution key generation.

* fix master

* Change cache deployer job to stateful set

* Delete cache deployer job

* Delete cache deployer job after it completes

* minor fix

* fix indention

* Change cache deployer job to statefulset

* Remove extra cluster role for cache deployer

* remove cache in base kustomize file for upgrade test

* minor fix
  • Loading branch information
rui5i authored and Jeffwan committed Dec 9, 2020
1 parent 3929cfa commit 806f9cc
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 27 deletions.
13 changes: 12 additions & 1 deletion backend/src/cache/deployer/deploy-cache-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ set -ex
echo "Start deploying cache service to existing cluster:"

NAMESPACE=${NAMESPACE_TO_WATCH:-default}
mutatingWebhookConfigName="cache-webhook"
export CA_FILE="ca_cert"
rm -f ${CA_FILE}
touch ${CA_FILE}
Expand All @@ -35,6 +36,16 @@ echo "Signed certificate generated for cache server"
NAMESPACE="$NAMESPACE" ./webhook-patch-ca-bundle.sh --cert_input_path "${CA_FILE}" <./cache-configmap.yaml.template >./cache-configmap-ca-bundle.yaml
echo "CA_BUNDLE patched successfully"

checkWebhookConfig() {
webhookconfig=$(kubectl get mutatingwebhookconfigurations -n ${NAMESPACE} ${mutatingWebhookConfigName})
}

# Create MutatingWebhookConfiguration
cat ./cache-configmap-ca-bundle.yaml
kubectl apply -f ./cache-configmap-ca-bundle.yaml --namespace "${NAMESPACE}"

while true; do
if ! checkWebhookConfig; then
kubectl apply -f ./cache-configmap-ca-bundle.yaml --namespace "${NAMESPACE}"
fi
sleep 10
done
24 changes: 0 additions & 24 deletions manifests/kustomize/base/cache-deployer/cache-deployer-job.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: cache-deployer-statefulset
labels:
app: cache-deployer
spec:
replicas: 1
serviceName: cache-deployer
selector:
matchLabels:
app: cache-deployer
template:
metadata:
labels:
app: cache-deployer
spec:
containers:
- name: main
image: gcr.io/ml-pipeline/cache-deployer:latest
imagePullPolicy: Always
env:
- name: NAMESPACE_TO_WATCH
valueFrom:
fieldRef:
fieldPath: metadata.namespace
serviceAccountName: kubeflow-pipelines-cache-deployer-sa
restartPolicy: Always
volumeClaimTemplates: []
2 changes: 1 addition & 1 deletion manifests/kustomize/base/cache-deployer/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ resources:
- cache-deployer-clusterrole.yaml
- cache-deployer-clusterrolebinding.yaml
- cache-deployer-sa.yaml
- cache-deployer-job.yaml
- cache-deployer-statefulset.yaml

2 changes: 1 addition & 1 deletion manifests/kustomize/base/cache/cache-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: server
image: gcr.io/ml-pipeline-test/cache-server:latest
image: gcr.io/ml-pipeline/cache-server:latest
env:
- name: DBCONFIG_DRIVER
valueFrom:
Expand Down

0 comments on commit 806f9cc

Please sign in to comment.