Skip to content

Commit

Permalink
Refactor code for Demo
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmyshah83 committed May 20, 2023
1 parent 00004a7 commit d87bcdd
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 51 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tf-plan-apply.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: 'Terraform Plan/Apply'

on:
# Enable for the purpose of the demo
# push:
# branches:
# - main
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# msft-learnings
# Azure Integrations with AKS

### AKS with Azure CNI Overlay

Expand Down
4 changes: 0 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ resource "azurerm_resource_group" "rg_cc_gh_demo" {
name = random_pet.rg_name.id
}

resource "random_id" "log_analytics_workspace_name_suffix" {
byte_length = 8
}

resource "azurerm_kubernetes_cluster" "aks_gh_demo" {
location = azurerm_resource_group.rg_cc_gh_demo.location
name = var.cluster_name
Expand Down
61 changes: 23 additions & 38 deletions output.tf
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
#output "client_certificate" {
# value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config[0].client_certificate
# sensitive = true
#}
#
#output "client_key" {
# value = azurerm_kubernetes_cluster.k8s.kube_config[0].client_key
# sensitive = true
#}
#
#output "cluster_ca_certificate" {
# value = azurerm_kubernetes_cluster.k8s.kube_config[0].cluster_ca_certificate
# sensitive = true
#}
#
#output "cluster_password" {
# value = azurerm_kubernetes_cluster.k8s.kube_config[0].password
# sensitive = true
#}
#
#output "cluster_username" {
# value = azurerm_kubernetes_cluster.k8s.kube_config[0].username
# sensitive = true
#}
#
#output "host" {
# value = azurerm_kubernetes_cluster.k8s.kube_config[0].host
# sensitive = true
#}
#
#output "kube_config" {
# value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config_raw
# sensitive = true
#}
#
#output "resource_group_name" {
# value = azurerm_resource_group.rg_cc_gh_demo.name
#}
output "cluster_password" {
value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config[0].password
sensitive = true
}

output "cluster_username" {
value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config[0].username
sensitive = true
}

output "host" {
value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config[0].host
sensitive = true
}

output "kube_config" {
value = azurerm_kubernetes_cluster.aks_gh_demo.kube_config_raw
sensitive = true
}

output "resource_group_name" {
value = azurerm_resource_group.rg_cc_gh_demo.name
}
4 changes: 0 additions & 4 deletions providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ terraform {
source = "hashicorp/azurerm"
version = ">= 3.7.0"
}
random = {
source = "hashicorp/random"
version = "~>3.0"
}
}

# Needs to be pre-configured in Azure either manually or via another Terraform script
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rootProject.name = 'msft-learnings'
rootProject.name = 'azure-integrations'
include 'spring-data-reactive-redis'
//include 'spring-reactive-cosmos'
4 changes: 2 additions & 2 deletions spring-reactive-cosmos/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spring:
cosmos:
database: coffee
endpoint: https://nosql-aks-backend-001.documents.azure.com:443/
key:
key: xxxxxxxxxxx
populate-query-metrics: false

redis:
Expand All @@ -24,7 +24,7 @@ spring:
cosmos:
database: coffee
endpoint: https://nosql-aks-backend-001.documents.azure.com:443/
key:
key: 6ffWa89IwUQm50nk86wucpdW40JtjE42qdDZZhrKseAJYjrsOtIBPhxUIe1nLGN0C5jHBmSdELU5ACDbzqDQWw==
populate-query-metrics: true
redis:
# host: http://redis-svc.aks-demo.svc.cluster.local:8761
Expand Down

0 comments on commit d87bcdd

Please sign in to comment.