Skip to content

Commit

Permalink
Revert "Add istio"
Browse files Browse the repository at this point in the history
This reverts commit 55cc06d.
  • Loading branch information
davi17g committed May 30, 2024
1 parent 55cc06d commit 440f794
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
32 changes: 16 additions & 16 deletions kubernetes/full-create-and-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export CLUSTER_NAME="${PROJECT_ID}-modern-world"
export NODE_POOL_NAME_AEROSPIKE="aerospike-pool"
export NODE_POOL_NAME_AVS="avs-pool"
export ZONE="us-central1-c"
export HELM_CHART_VECTOR="/Users/david/helm/aerospike/helm-charts/aerospike-vector-search"
export HELM_CHART_APP="/Users/david/helm/aerospike/helm-charts/aerospike-vector-search-examples/quote-semantic-search/"
#export HELM_CHART="aerospike/aerospike-avs"
export HELM_CHART="/home/joem/src/helm-charts/aerospike-vector-search"
export FEATURES_CONF="./features.conf"
export AEROSPIKE_CR="./manifests/ssd_storage_cluster_cr.yaml"

Expand Down Expand Up @@ -138,24 +138,24 @@ kubectl --namespace avs create secret generic aerospike-secret --from-file=featu
kubectl --namespace avs create secret generic auth-secret --from-literal=password='admin123'


echo "Deploying Istio"
helm repo add istio https://istio-release.storage.googleapis.com/charts
helm repo update
# echo "Deploying Istio"
# helm repo add istio https://istio-release.storage.googleapis.com/charts
# helm repo update

helm install istio-base istio/base --namespace istio-system --set defaultRevision=default --create-namespace --wait
helm install istiod istio/istiod --namespace istio-system --create-namespace --wait
helm install istio-ingress istio/gateway \
--values ./manifests/istio-ingressgateway-values.yaml \
--namespace istio-ingress \
--create-namespace \
--wait
# helm install istio-base istio/base --namespace istio-system --set defaultRevision=default --create-namespace --wait
# helm install istiod istio/istiod --namespace istio-system --create-namespace --wait
# helm install istio-ingress istio/gateway \
# --values "manifests/istio-ingressgateway-values.yaml" \
# --namespace istio-ingress \
# --create-namespace \
# --wait

kubectl apply -f ./manifests/gateway.yaml
kubectl apply -f ./manifests/virtual-service-vector-search.yaml
# kubectl apply -f "manifests/gateway.yaml"
# kubectl apply -f "manifests/virtual-service-vector-search.yaml"



helm install avs-gke --values "manifests/avs-gke-values.yaml" --namespace avs $HELM_CHART_VECTOR --wait
helm install avs-gke --values "manifests/avs-gke-values.yaml" --namespace avs $HELM_CHART --wait


##############################################
Expand All @@ -178,5 +178,5 @@ echo "To find the exposed port with 'kubectl get svc -n monitoring' "


echo To run the quote search sample app on your new cluster you can use
echo helm install sematic-search-app --namespace avs --values ./manifests/sematic-search-values.yaml $HELM_CHART_APP --wait
echo helm install sematic-search-app aerospike/quote-semantic-search --namespace avs --values manifests/sematic-search-values.yaml --wait

2 changes: 1 addition & 1 deletion kubernetes/manifests/avs-gke-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ aerospikeVectorSearchConfig:
ticker-interval: 10

service:
enabled: false
enabled: true
annotations:
networking.gke.io/load-balancer-type: "External"
ports:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/manifests/gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: avs-gw
namespace: avs
namespace: aerospike
spec:
selector:
istio: ingress
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
quoteSearchConfig:
avsHost: "istio-ingress.istio-ingress.svc.cluster.local"
avsHost: "avs-gke-aerospike-vector-search-lb.svc.cluster.local"
avsIsLoadbalancer: "True"
avsNamespace: "avs-meta"

6 changes: 3 additions & 3 deletions kubernetes/manifests/virtual-service-vector-search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: avs-vs
namespace: avs
namespace: aerospike
spec:
hosts:
- "*"
Expand All @@ -17,7 +17,7 @@ spec:
- destination:
port:
number: 8080
host: sematic-search-app-quote-semantic-search.avs.svc.cluster.local
host: quote-search-quote-semantic-search.aerospike.svc.cluster.local
- match:
- uri:
prefix: /
Expand All @@ -26,4 +26,4 @@ spec:
- destination:
port:
number: 5000
host: avs-gke-aerospike-vector-search.avs.svc.cluster.local
host: avs-gke-aerospike-vector-search.aerospike.svc.cluster.local

0 comments on commit 440f794

Please sign in to comment.