Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix config schema for istio and region #958

Closed
wants to merge 10 commits into from
Closed

Fix config schema for istio and region #958

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
13bd014
fix schema
Dec 10, 2024
fbd156c
add geo
Dec 10, 2024
212fa3a
fix lint
Dec 10, 2024
0160f9d
fix lint
Dec 10, 2024
98fab5e
remove unused version
Dec 10, 2024
0eb540d
add error message in make file
Dec 10, 2024
9eec6bb
fix config
Dec 10, 2024
25fe6c2
remove
Dec 10, 2024
b8978d4
remove unused
Dec 11, 2024
f98e224
add description
Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ detect-change: materialize
echo "Please review the diffs below:\n\n"; \
echo "$$diff_output"; \
echo "\n\n===================================================="; \
echo "\n\nOnce you reviewed the changes and consider them meaningful, commit them."; \
echo "\n\nOnce you reviewed the changes and consider them meaningful, commit them by running "make -C config/ materialize"."; \
echo "\n\n===================================================="; \
exit 1; \
else \
Expand Down
14 changes: 14 additions & 0 deletions config/config.msft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ defaults:
etcd:
kvName: arohcp-etcd-{{ .ctx.regionShort }}
kvSoftDelete: true
istio:
url: "https://istio.io/downloadIstio"
istioctlVersion: "1.23.1"
tag: "prod-stable"
version: "asm-1-22"
newVersion: ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A quick overview of why we need this kind of value would be useful. As I remember it there's some namespace selection going on, but it would be good to confirm.

I don't know how this value gets corrupted when we have concurrent upgrades going on. If we had an upgrade from 1 to 2 running but failed, then we tried to upgrade to 3, we'd need to have config that specified 1->3, since 2->3 wouldn't pick up regions that still were on 1? I don't know if we want that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I don't see the old version used for anything in the script - https://msazure.visualstudio.com/AzureRedHatOpenShift/_git/hcp?path=/ev2/svc/istio/archive/istio.sh&version=GBmain&line=13&lineEnd=14&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents

Are we sure we need both parameters?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so like i wrote it in the Readme
So basically

  1. we need to add istio new version and old version in to SVC infra pipeline. and run it( so svc cluster would have both version in the cluster)
  2. Run the istio pipeline to replace the version.
  3. Update the svc config to have the new version, and run the svc infra again.

Sorry for the confusion on having the old version in the script. it was a legacy code I forgot to delete from previous version of the shell script. I will delete it.


# MGMT cluster specifics
mgmt:
Expand Down Expand Up @@ -215,3 +221,11 @@ clouds:
# lets create this MSI manually for the time being and automate soon
# but we should use the MSI name as an input and not the resource ID of the MSI
aroDevopsMsiId: '/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc'

# Geographies
geographies:
jonathan34c marked this conversation as resolved.
Show resolved Hide resolved
- name: "United Kingdom"
regions:
- name: "uksouth"
settings:
mgmt: 3
jonathan34c marked this conversation as resolved.
Show resolved Hide resolved
46 changes: 45 additions & 1 deletion config/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,27 @@
},
"subscription": {
"type": "string"
}
},
"istio": {
jonathan34c marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"properties": {
"url": {
"type": "string"
},
"istioctlVersion": {
"type": "string"
},
"tag": {
"type": "string"
},
"version": {
"type": "string"
},
"newVersion": {
"type": "string"
}
}
}
},
"additionalProperties": false,
"required": [
Expand All @@ -635,6 +655,30 @@
},
"vnetAddressPrefix": {
"type": "string"
},
"geographies": {
"type": "array",
"properties": {
"name": {
"type": "string"
},
"regions": {
"type": "array",
"properties": {
"name": {
"type": "string"
},
"settings": {
"type": "object",
"properties": {
"mgmt": {
"type": "number"
}
}
}
}
}
}
}
},
"additionalProperties": false,
Expand Down
19 changes: 19 additions & 0 deletions config/public-cloud-msft-int.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
"private": false
}
},
"geographies": [
{
"name": "United Kingdom",
"regions": [
{
"mgmt": 3,
"name": "uksouth",
"settings": null
}
]
}
],
"global": {
"manageTokenCustomRole": false,
"region": "uksouth",
Expand Down Expand Up @@ -147,6 +159,13 @@
"kvName": "arohcp-etcd-int",
"kvSoftDelete": true
},
"istio": {
"istioctlVersion": "1.23.1",
"newVersion": "",
"tag": "prod-stable",
"url": "https://istio.io/downloadIstio",
"version": "asm-1-22"
},
"rg": "hcp-underlay-westus3-svc",
"subscription": "hcp-westus3",
"userAgentPool": {
Expand Down
Loading