diff --git a/.gitignore b/.gitignore index 459e4f3..0ea0782 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ terraform.rc # manifests/argocd/external-secrets.yaml # manifests/argocd/gcpsm-secret.yaml -# If we want to use external-secrets, these lines should be here. +# If we want to use external-secrets, these lines should be here # However, if they are already being tracked, firstly they should be untracked using: # git rm --cached # manifests/sealed-secrets/* diff --git a/manifests/argocd/install.yaml b/manifests/argocd/install.yaml index d78448f..2d5c707 100644 --- a/manifests/argocd/install.yaml +++ b/manifests/argocd/install.yaml @@ -1,4 +1,5 @@ -# Within this file, argoCD generates the necessary permissions to be able to generate resources within kubernetes cluster. +# Within this file, argoCD is installed, and also this manifest file generates the necessary permissions +# for argoCD so that it will be able to generate resources within kubernetes cluster. # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/manifests/blog-app/istio-gateway-virtualService.yaml b/manifests/blog-app/istio-gateway-virtualService.yaml index c2f87e5..dd7ce18 100644 --- a/manifests/blog-app/istio-gateway-virtualService.yaml +++ b/manifests/blog-app/istio-gateway-virtualService.yaml @@ -25,7 +25,7 @@ metadata: namespace: blog-app spec: hosts: - - "*" + - "blogapp.magdalani.com" # This VirtualService specifies a gateway (blog-app-gateway). # This indicates that it controls external traffic entering the mesh via this gateway. # The gateway listens for incoming requests from outside the cluster (e.g., users accessing your app via a web browser) @@ -53,4 +53,4 @@ spec: # VirtualService and frontend's service are both deployed in the same namespace, so they can find each other using only names. host: frontend port: - number: 80 + number: 80 \ No newline at end of file diff --git a/manifests/istio-system/kiali-virtualService.yaml b/manifests/istio-system/kiali-virtualService.yaml new file mode 100644 index 0000000..e60c649 --- /dev/null +++ b/manifests/istio-system/kiali-virtualService.yaml @@ -0,0 +1,16 @@ +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: kiali + namespace: istio-system # VirtualService is in istio-system namespace +spec: + hosts: + - "kiali.magdalani.com" + gateways: + - blog-app/blog-app-gateway # Reference the Gateway with namespace + http: + - route: + - destination: + host: kiali # They are in the same namespace, so using only name would be fine. otherwise, we would've said: `kiali.istio-system.svc.cluster.local` + port: + number: 20001 \ No newline at end of file diff --git a/terraform/provider.tf b/terraform/provider.tf index 1666848..e65cef9 100644 --- a/terraform/provider.tf +++ b/terraform/provider.tf @@ -11,7 +11,7 @@ provider "kubectl" { host = module.gke_auth.host cluster_ca_certificate = module.gke_auth.cluster_ca_certificate token = module.gke_auth.token - # Ensures Terraform uses the connection details provided directly in the + # Following line ensures that Terraform uses the connection details provided directly in the # Terraform configuration (e.g., host, cluster_ca_certificate, token), rather than relying on the local Kubernetes config file (~/.kube/config). load_config_file = false } @@ -24,11 +24,6 @@ terraform { } } - # time = { - # source = "hashicorp/time" - # version = "0.12.1" - # } - backend "gcs" { # Terraform state files will be located in the following path: # tf-state-sba-terraform-${{ secrets.PROJECT_ID }}/sba-terraform/${GITHUB_REF##*/}.tfstate