wiegee
/
sockshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wiegee:5bee888ecf3585b4d7efca435dd778c428528162
Branches Tags
wiegee:master
wiegee:staging
wiegee:production
wiegee:dev
..
compare: wiegee:81f360d63921efa13b5dd8c050dfbbcd073af031
Branches Tags
wiegee:master
wiegee:staging
wiegee:production
wiegee:dev

No commits in common. "5bee888ecf3585b4d7efca435dd778c428528162" and "81f360d63921efa13b5dd8c050dfbbcd073af031" have entirely different histories.
5bee888ecf ... 81f360d639

2 changed files with 19 additions and 24 deletions
Show Stats Expand all files Collapse all files

3
job-executer/job-cart.yaml
View File

@ -24,8 +24,7 @@ actions:
image: "alpine/helm:3.7.2"
serviceAccount: "jes-deploy-using-helm"
cmd: ["helm"]
#args: ["upgrade", "--force", "--create-namespace", "--install", "-n", "$(KEPTN_PROJECT)-$(KEPTN_STAGE)", "$(KEPTN_SERVICE)", "/keptn/charts/$(KEPTN_SERVICE).tgz", "--set", "image=$(IMAGE)", "--set", "keptn.service=$(KEPTN_SERVICE)", "--set", "keptn.deployment=$(KEPTN_STAGE)", "--set", "keptn.project=$(KEPTN_PROJECT)","--set", "keptn.stage=$(KEPTN_STAGE)", "--wait"]
args: ["upgrade", "--force", "--install", "-n", "$(KEPTN_PROJECT)-$(KEPTN_STAGE)", "$(KEPTN_SERVICE)", "/keptn/charts/$(KEPTN_SERVICE).tgz", "--set", "image=$(IMAGE)", "--set", "keptn.service=$(KEPTN_SERVICE)", "--set", "keptn.deployment=$(KEPTN_STAGE)", "--set", "keptn.project=$(KEPTN_PROJECT)","--set", "keptn.stage=$(KEPTN_STAGE)", "--wait"]
args: ["upgrade", "--force", "--create-namespace", "--install", "-n", "$(KEPTN_PROJECT)-$(KEPTN_STAGE)", "$(KEPTN_SERVICE)", "/keptn/charts/$(KEPTN_SERVICE).tgz", "--set", "image=$(IMAGE)", "--set", "keptn.service=$(KEPTN_SERVICE)", "--set", "keptn.deployment=$(KEPTN_STAGE)", "--set", "keptn.project=$(KEPTN_PROJECT)","--set", "keptn.stage=$(KEPTN_STAGE)", "--wait"]
- name: "Uninstall"
events:
- name: "sh.keptn.event.uninstall.triggered"

40
terraform/main.tf
View File

@ -56,8 +56,6 @@ resource "null_resource" "seed-unix-apply" {
#interpreter = ["cmd","/c","${abspath(path.module)}/bin/keptn-seed-project.bat",, var.GITEA_USER, var.GITEA_TOKEN]
}
depends_on = [kubernetes_namespace.carts-dev, kubernetes_namespace.carts-staging, kubernetes_namespace.carts-prod]
}
@ -111,8 +109,6 @@ resource "null_resource" "seed-unix-destroy" {
#interpreter = ["cmd","/c","${abspath(path.module)}/bin/keptn-seed-project.bat",, var.GITEA_USER, var.GITEA_TOKEN]
}
}
@ -150,27 +146,27 @@ resource "restful_operation" "add_subscription" {
}
resource "kubernetes_namespace" "carts-dev" {
metadata {
name = "carts-dev"
labels = {"monitor":"dynatrace"}
}
}
# resource "kubernetes_namespace" "carts-dev" {
# metadata {
# name = "carts-dev-test"
# labels = {"monitor":"dynatrace"}
# }
# }
resource "kubernetes_namespace" "carts-staging" {
metadata {
name = "carts-staging"
labels = {"monitor":"dynatrace"}
}
}
# resource "kubernetes_namespace" "carts-staging" {
# metadata {
# name = "carts-staging"
# labels = {"monitor":"dynatrace"}
# }
# }
resource "kubernetes_namespace" "carts-prod" {
metadata {
name = "carts-production"
labels = {"monitor":"dynatrace"}
}
}
# resource "kubernetes_namespace" "carts-prod" {
# metadata {
# name = "carts-production"
# labels = {"monitor":"dynatrace"}
# }
# }
# resource "seed" "win" {
# count = local.is_linux ? 0 : 1