Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ images:
newName: quay.io/sclorg/postgresql-18-c10s
newTag: latest
- name: ghcr.io/osac-project/fulfillment-service
newTag: sha-38f6f71
newTag: sha-6252427
- name: osac-aap
newName: ghcr.io/osac-project/osac-aap
newTag: sha-60be927
newTag: sha-3453b54
- name: ghcr.io/osac-project/osac-operator
newTag: sha-2858ec2
newTag: sha-0c69537
- name: envoy
newName: docker.io/envoyproxy/envoy
newTag: v1.33.0
Expand Down
2 changes: 1 addition & 1 deletion base/osac-fulfillment-service
2 changes: 1 addition & 1 deletion base/osac-operator
9 changes: 4 additions & 5 deletions overlays/caas-ci/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ secretGenerator:
options:
disableNameSuffixHash: true
literals:
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-60be927
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-3453b54
- AAP_PROJECT_GIT_URI=https://github.com/osac-project/osac-aap
- AAP_PROJECT_GIT_BRANCH=60be927342ea5efee9c5f1c1a65648610d82bb17
- AAP_PROJECT_GIT_BRANCH=3453b544737a6a70d729618b7648a50a55309037

- name: cluster-fulfillment-ig
options:
Expand Down Expand Up @@ -288,7 +288,7 @@ patches:
role in tenant_idp_manager_roles
}

# Check if an account is a regular client (no admin or tenant management roles):
# Check if an account is a regular client (no admin, tenant management roles):
default is_client = false
is_client if {
not is_admin
Expand Down Expand Up @@ -343,8 +343,7 @@ patches:
"/osac.public.v1.ComputeInstances/Get",
"/osac.public.v1.ComputeInstances/List",
"/osac.public.v1.ComputeInstances/Update",
"/osac.public.v1.Console/Connect",
"/osac.public.v1.Console/GetAccess",
"/osac.public.v1.ConsoleSessions/Create",
"/osac.public.v1.Events/Watch",
"/osac.public.v1.HostTypes/Get",
"/osac.public.v1.HostTypes/List",
Expand Down
5 changes: 2 additions & 3 deletions overlays/development/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ patches:
role in tenant_idp_manager_roles
}

# Check if an account is a regular client (no admin or tenant management roles):
# Check if an account is a regular client (no admin, tenant management roles):
default is_client = false
is_client if {
not is_admin
Expand Down Expand Up @@ -361,8 +361,7 @@ patches:
"/osac.public.v1.ComputeInstances/Get",
"/osac.public.v1.ComputeInstances/List",
"/osac.public.v1.ComputeInstances/Update",
"/osac.public.v1.Console/Connect",
"/osac.public.v1.Console/GetAccess",
"/osac.public.v1.ConsoleSessions/Create",
"/osac.public.v1.Events/Watch",
"/osac.public.v1.HostTypes/Get",
"/osac.public.v1.HostTypes/List",
Expand Down
9 changes: 4 additions & 5 deletions overlays/osac-integration/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ secretGenerator:
options:
disableNameSuffixHash: true
literals:
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-60be927
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-3453b54
- AAP_PROJECT_GIT_URI="https://github.com/osac-project/osac-aap"
- AAP_PROJECT_GIT_BRANCH=60be927342ea5efee9c5f1c1a65648610d82bb17
- AAP_PROJECT_GIT_BRANCH=3453b544737a6a70d729618b7648a50a55309037

- name: cluster-fulfillment-ig
options:
Expand Down Expand Up @@ -360,7 +360,7 @@ patches:
role in tenant_idp_manager_roles
}

# Check if an account is a regular client (no admin or tenant management roles):
# Check if an account is a regular client (no admin, tenant management roles):
default is_client = false
is_client if {
not is_admin
Expand Down Expand Up @@ -415,8 +415,7 @@ patches:
"/osac.public.v1.ComputeInstances/Get",
"/osac.public.v1.ComputeInstances/List",
"/osac.public.v1.ComputeInstances/Update",
"/osac.public.v1.Console/Connect",
"/osac.public.v1.Console/GetAccess",
"/osac.public.v1.ConsoleSessions/Create",
"/osac.public.v1.Events/Watch",
"/osac.public.v1.HostTypes/Get",
"/osac.public.v1.HostTypes/List",
Expand Down
9 changes: 4 additions & 5 deletions overlays/vmaas-ci/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ secretGenerator:
options:
disableNameSuffixHash: true
literals:
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-60be927
- AAP_EE_IMAGE=ghcr.io/osac-project/osac-aap:sha-3453b54
- AAP_PROJECT_GIT_URI=https://github.com/osac-project/osac-aap
- AAP_PROJECT_GIT_BRANCH=60be927342ea5efee9c5f1c1a65648610d82bb17
- AAP_PROJECT_GIT_BRANCH=3453b544737a6a70d729618b7648a50a55309037

- name: cluster-fulfillment-ig
options:
Expand Down Expand Up @@ -276,7 +276,7 @@ patches:
role in tenant_idp_manager_roles
}

# Check if an account is a regular client (no admin or tenant management roles):
# Check if an account is a regular client (no admin, tenant management roles):
default is_client = false
is_client if {
not is_admin
Expand Down Expand Up @@ -331,8 +331,7 @@ patches:
"/osac.public.v1.ComputeInstances/Get",
"/osac.public.v1.ComputeInstances/List",
"/osac.public.v1.ComputeInstances/Update",
"/osac.public.v1.Console/Connect",
"/osac.public.v1.Console/GetAccess",
"/osac.public.v1.ConsoleSessions/Create",
"/osac.public.v1.Events/Watch",
"/osac.public.v1.HostTypes/Get",
"/osac.public.v1.HostTypes/List",
Expand Down
8 changes: 4 additions & 4 deletions values/caas-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
operator:
image:
repository: ghcr.io/osac-project/osac-operator
tag: sha-2858ec2
tag: sha-0c69537
pullPolicy: Always
provisioning:
provider: "aap"
Expand All @@ -23,7 +23,7 @@ operator:
service:
variant: openshift
images:
service: ghcr.io/osac-project/fulfillment-service:sha-38f6f71
service: ghcr.io/osac-project/fulfillment-service:sha-6252427
envoy: docker.io/envoyproxy/envoy:v1.33.0
certs:
issuerRef:
Expand Down Expand Up @@ -79,7 +79,7 @@ aap:
name: "osac-aap"
bootstrap:
enabled: true
image: ghcr.io/osac-project/osac-aap:sha-60be927
image: ghcr.io/osac-project/osac-aap:sha-3453b54
cliImage: quay.io/openshift/origin-cli:4.20.0
backoffLimit: 15
configAsCode:
Expand All @@ -93,4 +93,4 @@ validation:
# --- Database migration ---
dbMigrate:
enabled: false
image: ghcr.io/osac-project/fulfillment-service:sha-38f6f71
image: ghcr.io/osac-project/fulfillment-service:sha-6252427
8 changes: 4 additions & 4 deletions values/vmaas-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
operator:
image:
repository: ghcr.io/osac-project/osac-operator
tag: sha-2858ec2
tag: sha-0c69537
pullPolicy: Always
provisioning:
provider: "aap"
Expand All @@ -23,7 +23,7 @@ operator:
service:
variant: openshift
images:
service: ghcr.io/osac-project/fulfillment-service:sha-38f6f71
service: ghcr.io/osac-project/fulfillment-service:sha-6252427
envoy: docker.io/envoyproxy/envoy:v1.33.0
certs:
issuerRef:
Expand Down Expand Up @@ -79,7 +79,7 @@ aap:
name: "osac-aap"
bootstrap:
enabled: true
image: ghcr.io/osac-project/osac-aap:sha-60be927
image: ghcr.io/osac-project/osac-aap:sha-3453b54
cliImage: quay.io/openshift/origin-cli:4.20.0
backoffLimit: 15
configAsCode:
Expand All @@ -93,4 +93,4 @@ validation:
# --- Database migration ---
dbMigrate:
enabled: false
image: ghcr.io/osac-project/fulfillment-service:sha-38f6f71
image: ghcr.io/osac-project/fulfillment-service:sha-6252427
Loading