Skip to content

Commit a82d9bf

Browse files
authored
feat(dp-terraform)!: remove subcharts (#2455)
Refers to ROX-31000, ROX-31001, ROX-31003, ROX-31004
1 parent 9c8e3a8 commit a82d9bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+16
-2491
lines changed

.secrets.baseline

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,6 @@
244244
"line_number": 1
245245
}
246246
],
247-
"dp-terraform/helm/rhacs-terraform/charts/secured-cluster/init-bundle.yaml": [
248-
{
249-
"type": "Private Key",
250-
"filename": "dp-terraform/helm/rhacs-terraform/charts/secured-cluster/init-bundle.yaml",
251-
"hashed_secret": "f0778f3e140a61d5bbbed5430773e52af2f5fba4",
252-
"is_verified": false,
253-
"line_number": 7
254-
}
255-
],
256247
"internal/central/pkg/api/public/api/openapi.yaml": [
257248
{
258249
"type": "Base64 High Entropy String",

dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ metadata:
44
name: rhacs-terraform
55
namespace: "$ACSCS_NAMESPACE"
66
spec:
7-
acsOperator:
8-
enabled: false
97
fleetshardSync:
108
image:
119
ref: "$FLEET_MANAGER_IMAGE"
@@ -39,15 +37,3 @@ spec:
3937
enabled: $ENABLE_EMAIL_SENDER
4038
enableHTTPS: false
4139
replicas: 1
42-
cloudwatch:
43-
enabled: false
44-
audit-logs:
45-
enabled: false
46-
secured-cluster:
47-
enabled: false
48-
scc:
49-
enabled: false
50-
vertical-pod-autoscaler:
51-
enabled: $INSTALL_VERTICAL_POD_AUTOSCALER_OLM
52-
nodeSelector:
53-
node-role.kubernetes.io/worker: ""

dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/01-namespace.yaml renamed to dev/env/manifests/vertical-pod-autoscaler-olm/01-namespace.yaml

File renamed without changes.

dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml renamed to dev/env/manifests/vertical-pod-autoscaler-olm/02-subscription.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ spec:
99
name: vertical-pod-autoscaler
1010
source: redhat-operators
1111
sourceNamespace: openshift-marketplace
12-
{{- if .Values.nodeSelector }}
1312
config:
1413
nodeSelector:
15-
{{- toYaml .Values.nodeSelector | nindent 6 }}
16-
{{- end }}
14+
# For HCP clusters, master nodes are hosted so VPA cannot use master node selectors
15+
# because of that we need a way to overwrite initial selectors
16+
node-role.kubernetes.io/worker: ""

dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/03-operator-group.yaml renamed to dev/env/manifests/vertical-pod-autoscaler-olm/03-operator-group.yaml

File renamed without changes.

dev/env/scripts/bootstrap.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ else
5353
log "Skipping installation of Vertical Pod Autoscaler"
5454
fi
5555

56+
if [[ "$INSTALL_VERTICAL_POD_AUTOSCALER_OLM" == "true" ]]; then
57+
log "Installing Vertical Pod Autoscaler using OLM"
58+
apply "${MANIFESTS_DIR}/vertical-pod-autoscaler-olm"
59+
else
60+
log "Skipping installation of Vertical Pod Autoscaler using OLM"
61+
fi
62+
5663
if [[ "$INSTALL_ARGOCD" == "true" ]]; then
5764
log "Installing ArgoCD"
5865
chamber exec gitops -- apply "${MANIFESTS_DIR}/argocd"
Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
dependencies:
2-
- name: cloudwatch
3-
repository: ""
4-
version: 0.1.0
5-
- name: logging
6-
repository: ""
7-
version: 0.1.0
8-
- name: audit-logs
9-
repository: ""
10-
version: 0.1.0
11-
- name: secured-cluster
12-
repository: ""
13-
version: 0.1.0
14-
- name: vertical-pod-autoscaler
15-
repository: ""
16-
version: 0.1.0
17-
digest: sha256:0a36a3980788badb99f58aec94b6b1e643e6345c053fced0267561574894b605
18-
generated: "2025-03-20T14:38:43.263767+01:00"
1+
dependencies: []
2+
digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
3+
generated: "2025-10-08T13:55:06.652931+02:00"

dp-terraform/helm/rhacs-terraform/Chart.yaml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: "0.4.0"
18+
version: "0.5.0"
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "0.4.0"
24+
appVersion: "0.5.0"
2525

2626
# List of sub-charts and other dependencies
27-
dependencies:
28-
- name: cloudwatch
29-
version: "0.1.0"
30-
condition: cloudwatch.enabled
31-
- name: audit-logs
32-
version: "0.1.0"
33-
condition: audit-logs.enabled
34-
- name: secured-cluster
35-
version: "0.1.0"
36-
condition: secured-cluster.enabled
37-
- name: vertical-pod-autoscaler
38-
version: "0.1.0"
39-
condition: vertical-pod-autoscaler.enabled
27+
dependencies: []

dp-terraform/helm/rhacs-terraform/charts/audit-logs/.helmignore

Lines changed: 0 additions & 23 deletions
This file was deleted.

dp-terraform/helm/rhacs-terraform/charts/audit-logs/Chart.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)