File tree Expand file tree Collapse file tree 6 files changed +26
-14
lines changed
Expand file tree Collapse file tree 6 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -18,3 +18,4 @@ misconfigurations:
1818 # EKS public exposure
1919 - id : AVD-AWS-0040
2020 - id : AVD-AWS-0041
21+ - id : AZU-0012
Original file line number Diff line number Diff line change 1+ {
2+ "recommendations" : [
3+ " esbenp.prettier-vscode" ,
4+ " davidanson.vscode-markdownlint" ,
5+ " redhat.vscode-yaml" ,
6+ " streetsidesoftware.code-spell-checker" ,
7+ " yzhang.markdown-all-in-one" ,
8+ " vue.volar"
9+ ]
10+ }
Original file line number Diff line number Diff line change @@ -4,27 +4,27 @@ SHELL := /usr/bin/env bash
44DEBUG := false
55ifeq ($(strip $(DEBUG ) ) ,true)
66 TF_LOG := DEBUG
7- DEBUG_MODE :=--terragrunt-log-level debug --terragrunt -debug
7+ TG_FLAGS := --inputs -debug
88endif
99
1010MODE := apply
1111ifeq ($(strip $(MODE ) ) ,apply)
12- MODE_STR := apply -auto-approve $(DEBUG_MODE)
12+ MODE_STR := --non-interactive -- apply -auto-approve
1313else ifeq ($(strip $(MODE)),destroy)
14- MODE_STR := destroy -auto-approve $(DEBUG_MODE)
14+ MODE_STR := --non-interactive -- destroy -auto-approve
1515else
16- MODE_STR := plan $(DEBUG_MODE)
16+ MODE_STR := --non-interactive -- plan
1717endif
1818
1919
2020ENV := dev-northeurope-shared1
2121
2222init : init-tf-backend
23- cd stage/$(ENV ) && terragrunt init -upgrade=true --non-interactive
23+ cd stage/$(ENV ) && terragrunt run -- init -upgrade=true
2424
2525
2626run : init # # setup ARO: make run [ENV=dev-northeurope-shared1] [MODE=apply]
27- @cd stage/$(ENV ) && terragrunt validate && terragrunt $(MODE_STR )
27+ @cd stage/$(ENV ) && terragrunt run validate && terragrunt run $(MODE_STR ) $( TG_FLAGS )
2828
2929
3030CLUSTER_RG = "$(shell cd stage/$(ENV ) && terragrunt output -raw cluster_rg 2>/dev/null) "
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ resource "azurerm_redhat_openshift_cluster" "aro" {
2929 # Available varsions:
3030 # az aro get-versions --location northeurope
3131 # Useful only during initial creation - as cluster can be created on with some version and later upgrade changes the version
32- version = " 4.18.26 "
32+ version = " 4.19.20 "
3333
3434
3535 # Resource Group Name: "dev"
Original file line number Diff line number Diff line change @@ -246,14 +246,15 @@ metadata:
246246spec:
247247 targetNamespaces:
248248 - openshift-adp
249+ upgradeStrategy: Default
249250---
250251apiVersion: operators.coreos.com/v1alpha1
251252kind: Subscription
252253metadata:
253254 name: redhat-oadp-operator
254255 namespace: openshift-adp
255256spec:
256- channel: stable-1.4
257+ channel: stable
257258 name: redhat-oadp-operator
258259 source: redhat-operators
259260 sourceNamespace: openshift-marketplace
Original file line number Diff line number Diff line change @@ -4,26 +4,26 @@ SHELL := /usr/bin/env bash
44DEBUG := false
55ifeq ($(strip $(DEBUG ) ) ,true)
66 TF_LOG := DEBUG
7- DEBUG_MODE :=--terragrunt-log-level debug --terragrunt -debug
7+ TG_FLAGS := --inputs -debug
88endif
99
1010MODE := apply
1111ifeq ($(strip $(MODE ) ) ,apply)
12- MODE_STR := apply -auto-approve $(DEBUG_MODE)
12+ MODE_STR := --non-interactive -- apply -auto-approve
1313else ifeq ($(strip $(MODE)),destroy)
14- MODE_STR := destroy -auto-approve $(DEBUG_MODE)
14+ MODE_STR := --non-interactive -- destroy -auto-approve
1515else
16- MODE_STR := plan $(DEBUG_MODE)
16+ MODE_STR := --non-interactive -- plan
1717endif
1818
1919
2020ENV := dev-northeurope
2121
2222init : init-tf-backend
23- cd stage/$(ENV ) && terragrunt init -upgrade=true --backend-bootstrap --non-interactive
23+ cd stage/$(ENV ) && terragrunt run -- init -upgrade=true
2424
2525run : init # # setup VPC: make run [ENV=dev] [MODE=apply]
26- @cd stage/$(ENV ) && terragrunt validate && terragrunt $(MODE_STR )
26+ @cd stage/$(ENV ) && terragrunt run validate && terragrunt run $(MODE_STR ) $( TG_FLAGS )
2727
2828show-state : # # show state
2929 cd stage/$(ENV ) && terragrunt state list && terragrunt show
You can’t perform that action at this time.
0 commit comments