Skip to content

Commit

Permalink
fix readiness probe
Browse files Browse the repository at this point in the history
  • Loading branch information
paulineribeyre committed Sep 12, 2024
1 parent 1e33bf9 commit ff67742
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions gen3/bin/kube-setup-funnel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ setup_funnel_infra() {

local namespace="$(gen3 db namespace)"
local configmap_name="funnel-config"
gen3_log_info "Deleting funnel configmap if it exists..."
gen3_log_info "Recreating funnel configmap..."
if kubectl get configmap $configmap_name -n $namespace > /dev/null 2>&1; then
g3kubectl delete configmap $configmap_name -n $namespace
fi
g3kubectl create configmap $configmap_name -n $namespace --from-file="${GEN3_HOME}/kube/services/funnel/funnel-server-config.yml" --from-file="$tempFile"
rm "$tempFile"

local sa_name="funnel-sa"
gen3_log_info "Deleting funnel SA if it exists..."
gen3_log_info "Recreating funnel SA..."
if kubectl get serviceaccount $sa_name -n $namespace 2>&1; then
g3kubectl delete serviceaccount $sa_name -n $namespace
fi
g3kubectl create serviceaccount $sa_name -n $namespace

local role_name="funnel-role" # hardcoded in `funnel-role.yaml`
gen3_log_info "Deleting funnel role if it exists..."
gen3_log_info "Recreating funnel role..."
if kubectl get role $role_name -n $namespace 2>&1; then
g3kubectl delete role $role_name -n $namespace
fi
g3kubectl create -f "${GEN3_HOME}/kube/services/funnel/funnel-role.yaml" -n $namespace

local role_binding_name="funnel-rolebinding" # hardcoded in `funnel-role-binding.yaml`
gen3_log_info "Deleting funnel role binding if it exists..."
gen3_log_info "Recreating funnel role binding..."
if kubectl get rolebinding $role_binding_name -n $namespace 2>&1; then
g3kubectl delete rolebinding $role_binding_name -n $namespace
fi
Expand Down
8 changes: 4 additions & 4 deletions kube/services/funnel/funnel-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ spec:
ephemeral-storage: 25G
readinessProbe:
httpGet:
path: /system
port: 8042
path: /
port: 8000
initialDelaySeconds: 5
periodSeconds: 20
timeoutSeconds: 30
livenessProbe:
httpGet:
path: /system
port: 8042
path: /
port: 8000
initialDelaySeconds: 5
periodSeconds: 60
timeoutSeconds: 30
Expand Down

0 comments on commit ff67742

Please sign in to comment.