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

Eventgrid tls min12 #866

Merged
merged 4 commits into from
Nov 21, 2024
Merged

Eventgrid tls min12 #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45ede6a
Configure min tls
janboll Nov 21, 2024
aa1cfc5
Update templates to consume changed config
janboll Nov 21, 2024
64cc4f7
Fix
janboll Nov 21, 2024
b44f96e
Review remarks
janboll Nov 21, 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
28 changes: 21 additions & 7 deletions config/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,26 @@
"consumerName": {
"type": "string"
},
"eventGridMaxClientSessionsPerAuthName": {
"type": "string"
},
"eventgridName": {
"type": "string"
"eventGrid": {
"type": "object",
Comment on lines +220 to +221
Copy link
Collaborator

Choose a reason for hiding this comment

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

❤️

"properties": {
"maxClientSessionsPerAuthName": {
"type": "string"
},
"name": {
"type": "string"
},
"minTLSVersion": {
"type": "string",
"enum": ["1.2"]
}
},
"additionalProperties": false,
"required": [
"maxClientSessionsPerAuthName",
"name",
"minTLSVersion"
]
},
"imageBase": {
"type": "string"
Expand Down Expand Up @@ -272,8 +287,7 @@
"required": [
"certDomain",
"consumerName",
"eventGridMaxClientSessionsPerAuthName",
"eventgridName",
"eventGrid",
"imageBase",
"imageTag",
"keyVaultName",
Expand Down
6 changes: 4 additions & 2 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ defaults:
# Maestro
maestro:
keyVaultName: arohcp-maestro-{{ .ctx.regionShort }}
eventgridName: arohcp-maestro-{{ .ctx.regionShort }}
eventGridMaxClientSessionsPerAuthName: '4'
eventGrid:
name: arohcp-maestro-{{ .ctx.regionShort }}
maxClientSessionsPerAuthName: '4'
minTLSVersion: '1.2'
certDomain: 'selfsigned.maestro.keyvault.azure.com'
postgres:
name: arohcp-maestro-{{ .ctx.regionShort }}
Expand Down
7 changes: 5 additions & 2 deletions config/public-cloud-cs-pr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
"consumerName": "hcp-underlay-cspr-mgmt-1",
"eventGridMaxClientSessionsPerAuthName": "4",
"eventgridName": "arohcp-maestro-cspr",
"eventGrid": {
"maxClientSessionsPerAuthName": "4",
"minTLSVersion": "1.2",
"name": "arohcp-maestro-cspr"
},
"imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
"imageTag": "ea066c250a002f0cc458711945165591bc9f6d3f",
"keyVaultName": "arohcp-maestro-cspr",
Expand Down
7 changes: 5 additions & 2 deletions config/public-cloud-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
"consumerName": "hcp-underlay-dev-mgmt-1",
"eventGridMaxClientSessionsPerAuthName": "4",
"eventgridName": "arohcp-maestro-dev",
"eventGrid": {
"maxClientSessionsPerAuthName": "4",
"minTLSVersion": "1.2",
"name": "arohcp-maestro-dev"
},
"imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
"imageTag": "ea066c250a002f0cc458711945165591bc9f6d3f",
"keyVaultName": "arohcp-maestro-dev",
Expand Down
7 changes: 5 additions & 2 deletions config/public-cloud-personal-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
"consumerName": "hcp-underlay-usw3tst-mgmt-1",
"eventGridMaxClientSessionsPerAuthName": "4",
"eventgridName": "arohcp-maestro-usw3tst",
"eventGrid": {
"maxClientSessionsPerAuthName": "4",
"minTLSVersion": "1.2",
"name": "arohcp-maestro-usw3tst"
},
"imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
"imageTag": "ea066c250a002f0cc458711945165591bc9f6d3f",
"keyVaultName": "arohcp-maestro-usw3tst",
Expand Down
2 changes: 1 addition & 1 deletion dev-infrastructure/configurations/mgmt-cluster.tmpl.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ param userAgentPoolAZCount = {{ .mgmt.userAgentPool.azCount }}
// Maestro
param maestroConsumerName = '{{ .maestro.consumerName }}'
param maestroKeyVaultName = '{{ .maestro.keyVaultName }}'
param maestroEventGridNamespacesName = '{{ .maestro.eventgridName }}'
param maestroEventGridNamespacesName = '{{ .maestro.eventGrid.name }}'
param maestroCertDomain = '{{ .maestro.certDomain }}'

// Hypershift
Expand Down
5 changes: 3 additions & 2 deletions dev-infrastructure/configurations/region.tmpl.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ param regionalDNSSubdomain = '{{ .regionalDNSSubdomain }}'

// maestro
param maestroKeyVaultName = '{{ .maestro.keyVaultName }}'
param maestroEventGridNamespacesName = '{{ .maestro.eventgridName }}'
param maestroEventGridMaxClientSessionsPerAuthName = {{ .maestro.eventGridMaxClientSessionsPerAuthName }}
param maestroEventGridNamespacesName = '{{ .maestro.eventGrid.name }}'
param maestroEventGridMaxClientSessionsPerAuthName = {{ .maestro.eventGrid.maxClientSessionsPerAuthName }}
param maestroEventGridMinimumTlsVersionAllowed = '{{ .maestro.eventGrid.minTLSVersion }}'
2 changes: 1 addition & 1 deletion dev-infrastructure/configurations/svc-cluster.tmpl.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ param deployFrontendCosmos = {{ .frontend.cosmosDB.deploy }}
param rpCosmosDbName = '{{ .frontend.cosmosDB.name }}'

param maestroKeyVaultName = '{{ .maestro.keyVaultName }}'
param maestroEventGridNamespacesName = '{{ .maestro.eventgridName }}'
param maestroEventGridNamespacesName = '{{ .maestro.eventGrid.name }}'
param maestroCertDomain = '{{ .maestro.certDomain}}'
param maestroPostgresServerName = '{{ .maestro.postgres.name }}'
param maestroPostgresServerMinTLSVersion = '{{ .maestro.postgres.minTLSVersion }}'
Expand Down
4 changes: 4 additions & 0 deletions dev-infrastructure/modules/maestro/maestro-infra.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ param maestroKeyVaultName string
@description('The name for the Managed Identity that will be created for Key Vault Certificate management.')
param kvCertOfficerManagedIdentityName string

@description('Minimum TLS version allowed for the EventGrid Namespace')
param minimumTlsVersionAllowed string = '1.2'

@description('Allow public network access to the EventGrid Namespace')
@allowed([
'Enabled'
Expand Down Expand Up @@ -118,6 +121,7 @@ resource eventGridNamespace 'Microsoft.EventGrid/namespaces@2024-06-01-preview'
properties: {
isZoneRedundant: true
publicNetworkAccess: publicNetworkAccess
minimumTlsVersionAllowed: minimumTlsVersionAllowed
topicSpacesConfiguration: {
state: 'Enabled'
maximumSessionExpiryInHours: 1
Expand Down
4 changes: 4 additions & 0 deletions dev-infrastructure/templates/region.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ param maestroEventGridNamespacesName string
@description('The maximum client sessions per authentication name for the EventGrid MQTT broker')
param maestroEventGridMaxClientSessionsPerAuthName int

@description('Minimum TLS version allowed for the EventGrid Namespace')
param maestroEventGridMinimumTlsVersionAllowed string = '1.2'

@description('Set to true to prevent resources from being pruned after 48 hours')
param persist bool = false

Expand Down Expand Up @@ -67,5 +70,6 @@ module maestroInfra '../modules/maestro/maestro-infra.bicep' = {
maestroKeyVaultName: maestroKeyVaultName
kvCertOfficerManagedIdentityName: maestroKeyVaultCertOfficerMSIName
publicNetworkAccess: 'Enabled'
minimumTlsVersionAllowed: maestroEventGridMinimumTlsVersionAllowed
}
}