Skip to content

Commit b7df705

Browse files
committed
feat: add github.dev recommended VC Code plugin (web only VSCode plugins)
update ARO, upgrade Terragrunt usage
1 parent db83119 commit b7df705

File tree

6 files changed

+26
-14
lines changed

6 files changed

+26
-14
lines changed

.trivyignore.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

.vscode/extensions.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
}

terraform/azure/aro/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ SHELL := /usr/bin/env bash
44
DEBUG := false
55
ifeq ($(strip $(DEBUG)),true)
66
TF_LOG := DEBUG
7-
DEBUG_MODE :=--terragrunt-log-level debug --terragrunt-debug
7+
TG_FLAGS := --inputs-debug
88
endif
99

1010
MODE := apply
1111
ifeq ($(strip $(MODE)),apply)
12-
MODE_STR := apply -auto-approve $(DEBUG_MODE)
12+
MODE_STR := --non-interactive -- apply -auto-approve
1313
else ifeq ($(strip $(MODE)),destroy)
14-
MODE_STR := destroy -auto-approve $(DEBUG_MODE)
14+
MODE_STR := --non-interactive -- destroy -auto-approve
1515
else
16-
MODE_STR := plan $(DEBUG_MODE)
16+
MODE_STR := --non-interactive -- plan
1717
endif
1818

1919

2020
ENV := dev-northeurope-shared1
2121

2222
init: init-tf-backend
23-
cd stage/$(ENV) && terragrunt init -upgrade=true --non-interactive
23+
cd stage/$(ENV) && terragrunt run -- init -upgrade=true
2424

2525

2626
run: 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

3030
CLUSTER_RG = "$(shell cd stage/$(ENV) && terragrunt output -raw cluster_rg 2>/dev/null)"

terraform/azure/aro/module/aro.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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"

terraform/azure/aro/module/configure-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,15 @@ metadata:
246246
spec:
247247
targetNamespaces:
248248
- openshift-adp
249+
upgradeStrategy: Default
249250
---
250251
apiVersion: operators.coreos.com/v1alpha1
251252
kind: Subscription
252253
metadata:
253254
name: redhat-oadp-operator
254255
namespace: openshift-adp
255256
spec:
256-
channel: stable-1.4
257+
channel: stable
257258
name: redhat-oadp-operator
258259
source: redhat-operators
259260
sourceNamespace: openshift-marketplace

terraform/azure/azure-network-setup/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ SHELL := /usr/bin/env bash
44
DEBUG := false
55
ifeq ($(strip $(DEBUG)),true)
66
TF_LOG := DEBUG
7-
DEBUG_MODE :=--terragrunt-log-level debug --terragrunt-debug
7+
TG_FLAGS := --inputs-debug
88
endif
99

1010
MODE := apply
1111
ifeq ($(strip $(MODE)),apply)
12-
MODE_STR := apply -auto-approve $(DEBUG_MODE)
12+
MODE_STR := --non-interactive -- apply -auto-approve
1313
else ifeq ($(strip $(MODE)),destroy)
14-
MODE_STR := destroy -auto-approve $(DEBUG_MODE)
14+
MODE_STR := --non-interactive -- destroy -auto-approve
1515
else
16-
MODE_STR := plan $(DEBUG_MODE)
16+
MODE_STR := --non-interactive -- plan
1717
endif
1818

1919

2020
ENV := dev-northeurope
2121

2222
init: 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

2525
run: 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

2828
show-state: ## show state
2929
cd stage/$(ENV) && terragrunt state list && terragrunt show

0 commit comments

Comments
 (0)