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

feat: update CS image in deployment environments to include new changes #1406

Merged
merged 3 commits into from
Feb 26, 2025
Merged

feat: update CS image in deployment environments to include new changes #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24ed7e
feat: update CS image in deployment environments to include new changes
miguelsorianod Feb 26, 2025
8c2c7d5
update demo cluster and nodepool templates to reference 4.18.1
miguelsorianod Feb 26, 2025
3fa2224
update image sync config to include 4.18.1
miguelsorianod Feb 26, 2025
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/config.msft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ clouds:
imageTag: c9a36e110a32c0c25aa5025cfe6d51af797e6d4b
clusterService:
image:
digest: sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0
digest: sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141
hypershiftOperator:
imageTag: 1bb8b1a
imageSync:
Expand Down
2 changes: 1 addition & 1 deletion config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ clouds:
# Cluster Service
clusterService:
image:
digest: sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0
digest: sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141
azureOperatorsManagedIdentities:
clusterApiAzure:
roleName: Azure Red Hat OpenShift Control Plane Operator Role - Dev
Expand Down
2 changes: 1 addition & 1 deletion config/public-cloud-cs-pr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"environment": "arohcpdev",
"image": {
"digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
"digest": "sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141",
"repository": "app-sre/uhc-clusters-service"
},
"k8s": {
Expand Down
2 changes: 1 addition & 1 deletion config/public-cloud-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"environment": "arohcpdev",
"image": {
"digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
"digest": "sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141",
"repository": "app-sre/uhc-clusters-service"
},
"k8s": {
Expand Down
2 changes: 1 addition & 1 deletion config/public-cloud-msft-int.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"environment": "arohcpint",
"image": {
"digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
"digest": "sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141",
"repository": "app-sre/uhc-clusters-service"
},
"k8s": {
Expand Down
2 changes: 1 addition & 1 deletion config/public-cloud-personal-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"environment": "arohcpdev",
"image": {
"digest": "sha256:aaa14dad6c01f06f2c380e0333db56097aa7b1dd8e696d9b3a8848d7d5362be0",
"digest": "sha256:2d8d8819267b01e34e8303a6904aa9e283c79a0a82d5b73f3c8c3afdb787e141",
"repository": "app-sre/uhc-clusters-service"
},
"k8s": {
Expand Down
4 changes: 2 additions & 2 deletions demo/cluster.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"properties": {
"version": {
"id": "openshift-v4.18.0-rc.8-candidate",
"channelGroup": "candidate"
"id": "openshift-v4.18.1",
"channelGroup": "stable"
},
"dns": {},
"network": {
Expand Down
4 changes: 2 additions & 2 deletions demo/node_pool.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"properties": {
"version": {
"id": "openshift-v4.18.0-rc.8-candidate",
"channelGroup": "candidate"
"id": "openshift-v4.18.1",
"channelGroup": "stable"
},
"platform": {
"subnetId": "/subscriptions/$sub/resourceGroups/$customer-rg/providers/Microsoft.Network/virtualNetworks/customer-vnet/subnets/customer-subnet-1",
Expand Down
5 changes: 3 additions & 2 deletions dev-infrastructure/templates/image-sync.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,11 @@ var ocpMirrorConfig = {
maxVersion: '4.17.0'
}
{
name: 'candidate-4.18'
name: 'stable-4.18'
type: 'ocp'
full: true
minVersion: '4.18.0-rc.6'
minVersion: '4.18.1'
maxVersion: '4.18.1'
}
]
graph: true
Expand Down
4 changes: 2 additions & 2 deletions image-sync/oc-mirror/test/ocp-image-set-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ mirror:
minVersion: 4.17.0
maxVersion: 4.17.0
type: ocp
- name: candidate-4.18
minVersion: 4.18.0-rc.6
- name: stable-4.18
minVersion: 4.18.1
full: true
type: ocp
graph: true
Expand Down