Skip to content

Commit 6cb78f5

Browse files
braghettosbraghettos
authored
feat: update ARO controller version to 2.13.0 (#248)
* feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: update ARO controller version to 2.13.0 * feat: prepare for 2.4.2 release * feat: update versions for 2.4.2 release
1 parent 6837209 commit 6cb78f5

13 files changed

+1421
-2734
lines changed

‎.github/workflows/release-pullrequest-AKS.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
k8s_version: [ "1.31.5", "1.30.9" ]
13+
k8s_version: [ "1.31.7", "1.32.3" ]
1414

1515
steps:
1616
- name: Extract and Store Trimmed Repository Name

‎.github/workflows/release-pullrequest-EKS.yaml‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ jobs:
690690
- name: Wait for Nodegroup Provisioning
691691
run: |
692692
echo "Waiting for EKS Nodegroup resource to become Ready..."
693-
kubectl wait --for=condition=ACK.ResourceSynced --timeout=1800s nodegroup/cluster-$K8S_VERSION_NODOT
693+
kubectl wait --for=condition=ACK.ResourceSynced --timeout=3600s nodegroup/cluster-$K8S_VERSION_NODOT
694694
695695
- name: Check Nodegroup status
696696
if: always()
@@ -709,4 +709,43 @@ jobs:
709709
run: kubectl get deployments -n
710710

711711
- name: Clean Up Sensitive Files
712-
run: rm -f certificato.txt chiave_privata_decifrata.key ./credentials
712+
run: rm -f certificato.txt chiave_privata_decifrata.key ./credentials
713+
714+
- name: Clean Up Nodegroup Resource
715+
if: always()
716+
run: kubectl delete nodegroup/cluster-$K8S_VERSION_NODOT
717+
718+
- name: Clean Up Cluster Resource
719+
if: always()
720+
run: kubectl delete cluster/cluster-$K8S_VERSION_NODOT
721+
722+
- name: Clean Up VPC Endpoints Resources
723+
run: |
724+
kubectl delete vpcendpoint/cluster-$K8S_VERSION_NODOT-ec2-endpoint
725+
kubectl delete vpcendpoint/cluster-$K8S_VERSION_NODOT-ecr-api-endpoint
726+
kubectl delete vpcendpoint/cluster-$K8S_VERSION_NODOT-ecr-dkr-endpoint
727+
kubectl delete vpcendpoint/cluster-$K8S_VERSION_NODOT-sts-endpoint
728+
729+
- name: Clean Up VPC Endpoints Security Group Resource
730+
run: kubectl delete securitygroup/cluster-$K8S_VERSION_NODOT-vpce-sg
731+
732+
- name: Celan Up Node Security Group Resource
733+
run: kubectl delete securitygroup/cluster-$K8S_VERSION_NODOT-node-sg
734+
735+
- name: Clean Up EKS Security Group Resource
736+
run: kubectl delete securitygroup/cluster-$K8S_VERSION_NODOT-eks-sg
737+
738+
- name: Clean Up Public Subnet-2 Resource
739+
run: kubectl delete subnet/cluster-$K8S_VERSION_NODOT-public-2
740+
741+
- name: Clean Up Public Subnet-1 Resource
742+
run: kubectl delete subnet/cluster-$K8S_VERSION_NODOT-public-1
743+
744+
- name: Clean Up Route Table Resource
745+
run: kubectl delete routetable/cluster-$K8S_VERSION_NODOT-public-rt
746+
747+
- name: Clean Up Internet Gateway Resource
748+
run: kubectl delete internetgateway/cluster-$K8S_VERSION_NODOT-igw
749+
750+
- name: Clean Up VPC Resource
751+
run: kubectl delete vpc/cluster-$K8S_VERSION_NODOT

‎.github/workflows/release-pullrequest-OpenShift.yaml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
k8s_version: [ "4.15.35", "4.14.38" ]
13+
k8s_version: [ "4.16.30" ]
1414

1515
steps:
1616
- name: Extract and Store Trimmed Repository Name
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
helm repo add aso2 https://raw.githubusercontent.com/Azure/azure-service-operator/main/v2/charts
108108
helm repo update
109-
helm install aso2 aso2/azure-service-operator --create-namespace --wait --version=2.12.0 --namespace=azureserviceoperator-system --set crdPattern='resources.azure.com/*;network.azure.com/*;redhatopenshift.azure.com/*;authorization.azure.com/*' --set replicaCount=1
109+
helm install aso2 aso2/azure-service-operator --create-namespace --wait --version=2.13.0 --namespace=azureserviceoperator-system --set crdPattern='resources.azure.com/*;network.azure.com/*;redhatopenshift.azure.com/*;authorization.azure.com/*' --set replicaCount=1
110110
111111
# Prepare a sanitized version string (replace '.' with '-') and store it in K8S_VERSION_NODOT
112112
- name: Prepare version variable
@@ -274,6 +274,17 @@ jobs:
274274
serviceCidr: 172.30.0.0/16
275275
apiserverProfile:
276276
visibility: Public
277+
operatorSpec:
278+
secrets:
279+
adminCredentials:
280+
name: adminCredentials
281+
key: adminCredentials
282+
username:
283+
name: credentials
284+
key: username
285+
password:
286+
name: credentials
287+
key: password
277288
EOF
278289
279290
- name: Wait for OpenShiftCluster Provisioning
@@ -283,13 +294,19 @@ jobs:
283294
- name: Wait for OpenShiftCluster Provisioning
284295
run: |
285296
echo "Waiting for OpenShiftCluster openshiftcluster-$K8S_VERSION_NODOT to become Ready..."
286-
kubectl wait --for=condition=Ready --timeout=2700s openshiftcluster/openshiftcluster-$K8S_VERSION_NODOT
297+
kubectl wait --for=condition=Ready --timeout=3600s openshiftcluster/openshiftcluster-$K8S_VERSION_NODOT
287298
288299
# TO DELETE
289-
- name: Wait for OpenShiftCluster Provisioning
300+
- name: Get OpenShiftCluster YAML
301+
if: always()
290302
run: |
291303
kubectl get openshiftcluster/openshiftcluster-$K8S_VERSION_NODOT -o yaml
292304
305+
# TO DELETE
306+
- name: Get secrets
307+
if: always()
308+
run: kubectl get secrets -A
309+
293310
- name: Retrieve OpenShiftCluster Kubeconfig
294311
run: |
295312
echo "Extracting kubeconfig from secret..."

‎.github/workflows/release-pullrequest-kind.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
jobs:
99
install-kind:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
k8s_version: [ "v1.31.6", "v1.32.3" ]
1114

1215
steps:
1316
- name: Extract and Store Trimmed Repository Name
@@ -76,6 +79,8 @@ jobs:
7679

7780
- name: Create k8s Kind Cluster
7881
uses: helm/kind-action@v1
82+
with:
83+
node_image: kindest/node:${{ matrix.k8s_version }}
7984

8085
- name: Install Krateo PlatformOps with standard configuration
8186
run: helm install installer ./chart --create-namespace -n krateo-system --wait

‎.github/workflows/release-pullrequest-upgrade.yaml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
name: release-pullrequest-upgrade
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
install-kind:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
k8s_version: [ "v1.31.6", "v1.32.3" ]
14+
15+
steps:
16+
- name: Extract and Store Trimmed Repository Name
17+
run: |
18+
REPO_CHART_NAME="${{ github.repository }}"
19+
REPO_APP_NAME=$(echo "$REPO_CHART_NAME" | sed 's/-chart$//') # Remove "-chart" suffix if present
20+
21+
# Check if the trimmed repo exists
22+
HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
23+
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
24+
"https://api.github.com/repos/$REPO_APP_NAME")
25+
26+
if [[ "$HTTP_STATUS" -eq 200 ]]; then
27+
echo "Using trimmed repository name: $REPO_APP_NAME"
28+
echo "REPO_APP_NAME=$REPO_APP_NAME" >> $GITHUB_ENV
29+
else
30+
echo "Trimmed repository not found. Falling back to original repository name."
31+
echo "REPO_APP_NAME=$REPO_CHART_NAME" >> $GITHUB_ENV
32+
fi
33+
34+
- name: Use the Stored Variable
35+
run: |
36+
echo "Trimmed Repository Name: ${{ env.REPO_APP_NAME }}"
37+
38+
- name: Authenticate with GitHub App
39+
id: authenticate
40+
uses: tibdex/github-app-token@v1
41+
with:
42+
app_id: ${{ secrets.APP_ID }}
43+
private_key: ${{ secrets.PRIVATE_KEY }}
44+
45+
- name: Extract latest App Version
46+
uses: tdemin/find-latest-tag@v1
47+
id: app_version
48+
with:
49+
repo: https://${{ steps.authenticate.outputs.token }}@github.com/${{ env.REPO_APP_NAME }}.git
50+
51+
- name: Extract latest Chart Version
52+
uses: tdemin/find-latest-tag@v1
53+
id: chart_version
54+
with:
55+
repo: https://${{ steps.authenticate.outputs.token }}@github.com/${{ github.repository }}.git
56+
57+
- name: Checkout
58+
uses: actions/checkout@v3
59+
60+
- name: Print Version
61+
id: bump
62+
run: |
63+
echo APP_VERSION:${{steps.app_version.outputs.tag}}
64+
echo CHART_VERSION:${{steps.chart_version.outputs.tag}}
65+
66+
IFS='.' read -r major minor patch <<< "${{ steps.chart_version.outputs.tag }}"
67+
patch=$((patch + 1))
68+
new_version="${major}.${minor}.${patch}"
69+
echo "$new_version" > VERSION
70+
echo "new_version=$new_version" >> $GITHUB_OUTPUT
71+
72+
- name: Replace Version in Chart.yaml
73+
run: sed -i 's/CHART_VERSION/${{ steps.bump.outputs.new_version }}/g' ./chart/Chart.yaml
74+
75+
- name: Print latest App Version
76+
run: echo ${{ steps.app_version.outputs.tag }}
77+
78+
- name: Replace App Version in Chart.yaml
79+
run: sed -i 's/APP_VERSION/${{ steps.app_version.outputs.tag }}/g' ./chart/Chart.yaml
80+
81+
- name: Set up Helm
82+
uses: azure/setup-helm@v4.1.0
83+
84+
- name: Helm lint
85+
run: helm lint ./chart
86+
87+
- name: Create k8s Kind Cluster
88+
uses: helm/kind-action@v1
89+
with:
90+
node_image: kindest/node:${{ matrix.k8s_version }}
91+
92+
- name: Install latest Krateo PlatformOps with standard configuration
93+
run: |
94+
helm repo add krateo https://charts.krateo.io
95+
helm repo update krateo
96+
helm install installer krateo/installer --create-namespace -n krateo-system --wait
97+
98+
- name: Wait for krateoplatformops krateo to become ready
99+
run: kubectl wait krateoplatformops krateo --for condition=Ready=True --timeout=600s --namespace krateo-system
100+
101+
- name: Get krateo version
102+
run: helm list --namespace krateo-system --filter '^installer$' --output json | jq -r '.[0].chart' | sed 's/.*-//'
103+
104+
- name: Get krateoplatformops yaml
105+
run: kubectl get krateoplatformops krateo --namespace krateo-system -o yaml > krateo-old.yaml
106+
107+
- name: Upgrade Krateo PlatformOps with standard configuration
108+
run: helm upgrade installer ./chart -n krateo-system --wait
109+
110+
- name: Wait for krateoplatformops krateo to become ready
111+
run: kubectl wait krateoplatformops krateo --for condition=Ready=True --timeout=600s --namespace krateo-system
112+
113+
- name: Get krateo version
114+
run: helm list --namespace krateo-system --filter '^installer$' --output json | jq -r '.[0].chart' | sed 's/.*-//'
115+
116+
- name: Get krateoplatformops yaml
117+
run: kubectl get krateoplatformops krateo --namespace krateo-system -o yaml > krateo-new.yaml
118+
119+
- name: Set up Python
120+
uses: actions/setup-python@v4
121+
with:
122+
python-version: '3.11'
123+
124+
- name: Install dependencies
125+
run: pip install pyyaml deepdiff
126+
127+
- name: Compare YAML files
128+
run: |
129+
python <<EOF
130+
import yaml
131+
from deepdiff import DeepDiff
132+
133+
with open('krateo-old.yaml') as f1, open('krateo-new.yaml') as f2:
134+
y1 = yaml.safe_load(f1)
135+
y2 = yaml.safe_load(f2)
136+
137+
diff = DeepDiff(y1, y2, ignore_order=True)
138+
if diff:
139+
print("🔍 Differences found:")
140+
print(diff.to_json(indent=2))
141+
exit(1) # fail job if there are differences
142+
else:
143+
print("✅ No differences found.")
144+
EOF
145+
146+
- name: Get events
147+
if: always()
148+
run: kubectl get events -A --sort-by='.lastTimestamp'

‎chart/templates/NOTES.txt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{{- if .Values.krateoplatformops.vcluster.enabled }}
2-
Thanks for installing vCluster to host Krateo PlatformOps
3-
{{- else if not .Values.krateoplatformops.vcluster.enabled }}
4-
Thanks for installing Krateo PlatformOps
5-
{{- else }}
6-
Something is wrong in the evaluation of .Values.krateoplatformops.vcluster.enabled
7-
{{- end }}
1+
Thanks for installing Krateo PlatformOps

‎chart/templates/clusterrole-krateo-installer.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if not .Values.krateoplatformops.vcluster.enabled }}
21
apiVersion: rbac.authorization.k8s.io/v1
32
kind: ClusterRole
43
metadata:
@@ -33,4 +32,3 @@ rules:
3332
- apiGroups: ["admissionregistration.k8s.io"]
3433
resources: ["mutatingwebhookconfigurations"]
3534
verbs: ["*"]
36-
{{- end }}

‎chart/templates/clusterrole-vcluster-installer.yaml‎

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

‎chart/templates/clusterrolebinding-krateo-installer.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if not .Values.krateoplatformops.vcluster.enabled }}
21
apiVersion: rbac.authorization.k8s.io/v1
32
kind: ClusterRoleBinding
43
metadata:
@@ -13,4 +12,3 @@ subjects:
1312
- kind: ServiceAccount
1413
name: {{ include "installer.serviceAccountName" . }}
1514
namespace: {{ .Release.Namespace }}
16-
{{- end }}

‎chart/templates/clusterrolebinding-vcluster-installer.yaml‎

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

0 commit comments

Comments
 (0)