fine tune the Azure setup (#850)

hack/aks/property-based-scheduling.md → hack/Azure/property-based-scheduling.md

@@ -1,8 +1,3 @@
-ms.topic: article
-ms.custom: azure-kubernetes-service, devx-track-azurecli
-ms.date: 04/19/2024
-author: michaelawyu
-
 # Apply Fleet property-based scheduling (preview) on your Azure Kubernetes Service (AKS) cluster
 
 This document explains how to try out the latest Fleet feature, property-based scheduling, using AKS clusters.

hack/Azure/setup/README.md

@@ -27,10 +27,12 @@ run the commands bellow:
 ```sh
 # Replace the value of <AZURE-SUBSCRIPTION-ID> with your Azure subscription ID.
 export SUB=<AZURE-SUBSCRIPTION-ID>
+export RESOURCE_GROUP=<HUB_RESOURCE_GROUP>
+export LOCATION=<HUB_LOCATION>
 
-# Run the script. Be sure to replace the values of <RESOURCE-GROUP-NAME>, <LOCATION>, and <HUB-CLUSTER-NAME> with those of your own.
+# Run the script. Be sure to replace the values of <HUB-CLUSTER-NAME> with those of your own.
 chmod +x hack/Azure/setup/createHubCluster.sh
-./hack/Azure/setup/createHubCluster.sh <RESOURCE-GROUP-NAME> <LOCATION> <HUB-CLUSTER-NAME>
+./hack/Azure/setup/createHubCluster.sh <HUB-CLUSTER-NAME>
 ```
 
 It may take a few minutes for the script to finish running. Once it is completed, verify that the `hub-agent` has been installed:
@@ -49,9 +51,9 @@ If you would like to add a prometheus server to access metrics, run the followin
 
 2. Install the Prometheus community Helm Chart
    ```
-    helm install prom prometheus-community/kube-prometheus-stack -f prom1.yaml
+    helm install prom prometheus-community/kube-prometheus-stack -f prommethus.yaml
    ```
-   The `prom1.yaml` file should contain the following YAML code:
+   The `prommethus.yaml` file should contain the following YAML code:
     ```yaml
     prometheus:
         service:
@@ -76,13 +78,14 @@ A cluster can join in a hub cluster if:
 
 > Note
 >
-> To run this script, make sure you have already created cluster(s) and gotten their credentials.
+> To run this script, make sure you have already created cluster(s) and gotten their credentials in the same 
+> Kubeconfig file as the hub cluster.
 > 
 
 For your convenience, Fleet provides a script that can automate the process of joining a cluster
 onto a hub cluster. To use the script, run the commands below after creating needed AKS clusters:
 ```sh
-# Pass in the hub cluster name and a list of cluster names (separated by a space) as arguments to the script that you would like to 
+# Pass in the hub cluster name and a list of cluster context names (separated by a space) as arguments to the script that you would like to 
 # join the fleet as member clusters. Their context will be used to access the cluster.
 # Ex.: ./hack/setup/joinMC.sh test-hub member member2 member3 
 # Run the script.

hack/Azure/setup/createHubCluster.sh

@@ -1,8 +1,6 @@
 # This script creates a Hub CLuster from an AKS Cluster (AKS Cluster and Container Registry must be created beforehand).
 
-export RESOURCE_GROUP=$1
-export LOCATION=$2
-export HUB_CLUSTER=$3
+export HUB_CLUSTER=$1
 
 az account set -s ${SUB}
 az group create --name $RESOURCE_GROUP --location $LOCATION

hack/Azure/setup/joinMC.sh

@@ -36,7 +36,7 @@ metadata:
 type: kubernetes.io/service-account-token
 EOF
 
-echo "Creating member cluster..."
+echo "Creating member cluster CR..."
 export TOKEN="$(kubectl get secret $SERVICE_ACCOUNT_SECRET -n fleet-system -o jsonpath='{.data.token}' | base64 --decode)"
 cat <<EOF | kubectl apply -f -
 apiVersion: cluster.kubernetes-fleet.io/v1beta1
@@ -49,7 +49,7 @@ spec:
         kind: ServiceAccount
         namespace: fleet-system
         apiGroup: ""
-    heartbeatPeriodSeconds: 60
+    heartbeatPeriodSeconds: 15
 EOF
 
 # # Install the member agent helm chart on the member cluster.
@@ -73,6 +73,9 @@ kubectl config use-context $MEMBER_CLUSTER_CONTEXT
 echo "Creating secret..."
 kubectl create secret generic hub-kubeconfig-secret --from-literal=token=$TOKEN
 
+echo "Uninstalling member-agent..."
+helm uninstall member-agent --wait
+
 echo "Installing member-agent..."
 helm install member-agent charts/member-agent/ \
         --set config.hubURL=$HUB_CLUSTER_ADDRESS  \

hack/Azure/setup/prommethus.yaml

@@ -0,0 +1,8 @@
+prometheus:
+  service:
+    type: LoadBalancer
+    prometheusSpec:
+      additionalScrapeConfigs:
+        - job_name: "fleet"
+          static_configs:
+          - targets: ["<EXTERNAL-IP>:8080"]