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

dspo v1.6.4 changes #53

Merged
merged 5 commits into from
Mar 5, 2024
Merged

dspo v1.6.4 changes #53

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
a6367dc
chore: ignore empty cabundle fields.
HumairAK Mar 5, 2024
48c5cdd
Merge pull request #582 from HumairAK/v1.6.x
HumairAK Mar 5, 2024
3e88a2a
Add params for v1.6.4
HumairAK Mar 5, 2024
0b90001
Merge pull request #583 from HumairAK/v1.6.x
HumairAK Mar 5, 2024
53b1135
Merge pull request #584 from opendatahub-io/v1.6.x
HumairAK Mar 5, 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
12 changes: 6 additions & 6 deletions config/base/params.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server@sha256:579a29f4cd40ef3cf8ed199d0b9e2a6fd09a70fb68afad3db278a616609c6728
IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager@sha256:a451356d8004c3609438d1fe21bc46e0ae54fa9d35532e8c9dac8cc269afd8d5
IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent@sha256:f41b53112114105436155a95e06d35512272d36ab3ff50c3cbd432eb6ac77652
IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow@sha256:fccdcb63c87eef2b7e2db0477a74c2f3b4f42e0a8fc30b226555ec5b39cc4006
IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server@sha256:caca0638eef179e61c97878cc4adc1a39473b3c67f46c808175560cf824fac82
IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager@sha256:1d322d5f72fe5b4599cb88810aa8b86da6af7859b395400543e24696cdfc3948
IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent@sha256:02bca29b5e5bcde17d18d991d0893a1aef357dbd175729698fc246ec72ee967d
IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow@sha256:0c09b453151cf037b2055a8e94ec36716207da43cf99a9faa19dfc52ac8cb67f
IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy@sha256:c491e63c8885c7d59005f9305b77cd1fa776b50e63db90c4f8ccdee963759630
IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc@sha256:4af88c246d77cce33099489090508734978aafa83a0a5745408ae8d139d5378a
IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer@sha256:f14fe825f27258168f9c5e99d162e3737427d8b6917a697ee42c6dfb15f94879
IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator@sha256:ad0fbec2c0d8e2dcd383e75eae069feee8394ff920471ff5a377fe3e3a3f7f66
IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer@sha256:393ddb21afe13166e972022153479450bb66b2c9b1896e62a484aed2ac62b388
IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator@sha256:d00d694bf827e71957fcd7cc15f397221772749f9be9bf0787b1c555c959d31d
IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal@sha256:a49924d9d685a35b2d0817ffe9c84f3429d97e9ad29ed3816c389f45564c9e19
IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro@sha256:396baed3d689157d96aa7d8988fdfea7eb36684c8335eb391cf1952573e689c1
IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:3d30992e60774f887c4e7959c81b0c41b0d82d042250b3b56f05ab67fd4cdee1
Expand Down
11 changes: 9 additions & 2 deletions controllers/dspipeline_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,10 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
log.Info(fmt.Sprintf("Found global CA Bundle %s present in this namespace %s, this bundle will be included in external tls connections.", config.GlobalODHCaBundleConfigMapName, p.Namespace))
// "odh-trusted-ca-bundle" can have fields: "odh-ca-bundle.crt" and "ca-bundle.crt", we need to utilize both
for _, val := range globalCerts {
p.APICustomPemCerts = append(p.APICustomPemCerts, []byte(val))
// If the ca-bundle field is empty, ignore it
if val != "" {
p.APICustomPemCerts = append(p.APICustomPemCerts, []byte(val))
}
}
}

Expand All @@ -535,7 +538,11 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
log.Info(fmt.Sprintf("Encountered error when attempting to fetch ConfigMap: [%s], Error: %v", dspaCaBundleCfgName, dspaCACfgErr))
return dspaCACfgErr
}
p.APICustomPemCerts = append(p.APICustomPemCerts, []byte(dspaProvidedCABundle))

// If the ca-bundle field is empty, ignore it
if dspaProvidedCABundle != "" {
p.APICustomPemCerts = append(p.APICustomPemCerts, []byte(dspaProvidedCABundle))
}
}

// There are situations where global & user provided certs, or a provided ca trust configmap(s) have various trust bundles
Expand Down
Loading