Skip to content

[test]: Use NodePool & HostedCluster read desire during clusters & node pool status reconciliation within CS as well as persist what's done by those watching controllers to Cosmos' Resources container. #6832

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

Closed
Manyanda Chitimbo (machi1990) wants to merge 5 commits into from
Closed

[test]: Use NodePool & HostedCluster read desire during clusters & node pool status reconciliation within CS as well as persist what's done by those watching controllers to Cosmos' Resources container. #6832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18fd587
chore: bump cs to a personal dev env image
machi1990 Sep 2, 2026
7752cbc
chore: bump Clusters service image to a local image that has a change…
machi1990 Sep 3, 2026
b4be5db
chore: Bump CS image to an image built with code changes on https://g…
machi1990 Sep 4, 2026
756324c
fix: bump to a digest that contains the matcher fixer to avoid discar…
machi1990 Sep 4, 2026
5fca5e6
chore: point to a digest that has some logging improvements
machi1990 Sep 4, 2026
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
6 changes: 3 additions & 3 deletions cluster-service/testdata/zz_fixture_TestHelmTemplate_cs_azuredb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7971,7 +7971,7 @@ spec:
secretProviderClass: cs-keyvault
initContainers:
- name: clusters-service-init
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
# We set AZURE_TOKEN_CREDENTIALS to WorkloadIdentityCredential to force workload identity because this pod uses
Expand Down Expand Up @@ -8006,7 +8006,7 @@ spec:
- --azure-first-party-application-certificate-bundle-path=/secrets/keyvault/firstPartyApplicationCertificateBundle
containers:
- name: clusters-service-server
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
- name: DENYASSIGNMENTS
Expand Down Expand Up @@ -8256,7 +8256,7 @@ spec:
acr:
environment: PublicCloud
server: 'arohcpsvcdev.azurecr.io'
scope: 'repository:app-sre/aro-hcp-clusters-service:pull'
scope: 'repository:mchitimb/cs:pull'
auth:
workloadIdentity:
serviceAccountRef: 'clusters-service'
Expand Down
6 changes: 3 additions & 3 deletions cluster-service/testdata/zz_fixture_TestHelmTemplate_cs_containerdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8072,7 +8072,7 @@ spec:
secretProviderClass: cs-keyvault
initContainers:
- name: clusters-service-init
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
# We set AZURE_TOKEN_CREDENTIALS to WorkloadIdentityCredential to force workload identity because this pod uses
Expand Down Expand Up @@ -8107,7 +8107,7 @@ spec:
- --azure-first-party-application-certificate-bundle-path=/secrets/keyvault/firstPartyApplicationCertificateBundle
containers:
- name: clusters-service-server
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
- name: DENYASSIGNMENTS
Expand Down Expand Up @@ -8357,7 +8357,7 @@ spec:
acr:
environment: PublicCloud
server: 'arohcpsvcdev.azurecr.io'
scope: 'repository:app-sre/aro-hcp-clusters-service:pull'
scope: 'repository:mchitimb/cs:pull'
auth:
workloadIdentity:
serviceAccountRef: 'clusters-service'
Expand Down
6 changes: 3 additions & 3 deletions cluster-service/testdata/zz_fixture_TestHelmTemplate_cs_distinct_arm_helper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7971,7 +7971,7 @@ spec:
secretProviderClass: cs-keyvault
initContainers:
- name: clusters-service-init
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
# We set AZURE_TOKEN_CREDENTIALS to WorkloadIdentityCredential to force workload identity because this pod uses
Expand Down Expand Up @@ -8006,7 +8006,7 @@ spec:
- --azure-first-party-application-certificate-bundle-path=/secrets/keyvault/firstPartyApplicationCertificateBundle
containers:
- name: clusters-service-server
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
- name: DENYASSIGNMENTS
Expand Down Expand Up @@ -8256,7 +8256,7 @@ spec:
acr:
environment: PublicCloud
server: 'arohcpsvcdev.azurecr.io'
scope: 'repository:app-sre/aro-hcp-clusters-service:pull'
scope: 'repository:mchitimb/cs:pull'
auth:
workloadIdentity:
serviceAccountRef: 'clusters-service'
Expand Down
6 changes: 3 additions & 3 deletions cluster-service/testdata/zz_fixture_TestHelmTemplate_cs_shared_arm_helper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7971,7 +7971,7 @@ spec:
secretProviderClass: cs-keyvault
initContainers:
- name: clusters-service-init
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
# We set AZURE_TOKEN_CREDENTIALS to WorkloadIdentityCredential to force workload identity because this pod uses
Expand Down Expand Up @@ -8006,7 +8006,7 @@ spec:
- --azure-first-party-application-certificate-bundle-path=/secrets/keyvault/firstPartyApplicationCertificateBundle
containers:
- name: clusters-service-server
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
- name: DENYASSIGNMENTS
Expand Down Expand Up @@ -8256,7 +8256,7 @@ spec:
acr:
environment: PublicCloud
server: 'arohcpsvcdev.azurecr.io'
scope: 'repository:app-sre/aro-hcp-clusters-service:pull'
scope: 'repository:mchitimb/cs:pull'
auth:
workloadIdentity:
serviceAccountRef: 'clusters-service'
Expand Down
6 changes: 3 additions & 3 deletions cluster-service/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_cluster_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7971,7 +7971,7 @@ spec:
secretProviderClass: cs-keyvault
initContainers:
- name: clusters-service-init
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
# We set AZURE_TOKEN_CREDENTIALS to WorkloadIdentityCredential to force workload identity because this pod uses
Expand Down Expand Up @@ -8006,7 +8006,7 @@ spec:
- --azure-first-party-application-certificate-bundle-path=/secrets/keyvault/firstPartyApplicationCertificateBundle
containers:
- name: clusters-service-server
image: 'arohcpsvcdev.azurecr.io/app-sre/aro-hcp-clusters-service@sha256:1234567890'
image: 'arohcpsvcdev.azurecr.io/mchitimb/cs@sha256:1234567890'
imagePullPolicy: IfNotPresent
env:
- name: DENYASSIGNMENTS
Expand Down Expand Up @@ -8256,7 +8256,7 @@ spec:
acr:
environment: PublicCloud
server: 'arohcpsvcdev.azurecr.io'
scope: 'repository:app-sre/aro-hcp-clusters-service:pull'
scope: 'repository:mchitimb/cs:pull'
auth:
workloadIdentity:
serviceAccountRef: 'clusters-service'
Expand Down
6 changes: 3 additions & 3 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,9 @@ defaults:
# Cluster Service
clustersService:
image:
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912 # 5fc479961bb4bdcad6a58b5075879613a913d583 (2026-08-30 13:46)
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
Comment thread
machi1990 marked this conversation as resolved.
# controls how many HCPs can be placed on an MC, sadly not configurable per MC
provisionShardClusterLimit: 100
provisionShardStatus: active
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/ci00/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcpci00
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/ci01/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcpci01
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/cspr/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcpcspr
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/dev/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcpdev
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/perf/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcpperf
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down
6 changes: 3 additions & 3 deletions config/rendered/dev/pers/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ clustersService:
deployDebugJobs: false
environment: arohcppers
image:
digest: sha256:4bc659373dbf9b5eba2df7da2ceccec2952fa6d712a406a2a2a13e887228c912
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:d4464057af938f1defaa363d7e347e0080128f58ed0f7ca6b27622380325284c
registry: arohcpsvcdev.azurecr.io
repository: mchitimb/cs
k8s:
deploymentStrategy:
rollingUpdate:
Expand Down