Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Copy link
Contributor

Choose a reason for hiding this comment

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

Did they remove these fields?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixing in #4070

Description: "Root signer for customer break-glass credentials.",
},
certrotation.CABundleConfigMap{
Namespace: hostedControlPlane.Namespace,
Expand All @@ -102,8 +100,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Description: "Trust bundle for customer break-glass credentials.",
},
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: hostedControlPlane.Namespace,
Expand All @@ -122,8 +118,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Description: "Client certificate for customer break-glass credentials.",
},
eventRecorder,
clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, hypershiftClient),
Expand All @@ -143,8 +137,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Description: "Root signer for SRE break-glass credentials.",
},
certrotation.CABundleConfigMap{
Namespace: hostedControlPlane.Namespace,
Expand All @@ -154,8 +146,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Description: "Trust bundle for SRE break-glass credentials.",
},
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: hostedControlPlane.Namespace,
Expand All @@ -174,8 +164,6 @@ func NewCertRotationController(
Client: kubeClient.CoreV1(),
EventRecorder: eventRecorder,
Owner: ownerRef,
JiraComponent: "HOSTEDCP",
Description: "Client certificate for SRE break-glass credentials.",
},
eventRecorder,
clienthelpers.NewHostedControlPlaneStatusReporter(hostedControlPlane.Name, hostedControlPlane.Namespace, hypershiftClient),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/openshift/hypershift/control-plane-pki-operator/clienthelpers"
pkimanifests "github.com/openshift/hypershift/control-plane-pki-operator/manifests"
"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/certrotation"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
Expand Down Expand Up @@ -102,7 +103,10 @@ func ManageClientCABundle(ctx context.Context, lister corev1listers.ConfigMapLis
requiredConfigMap, err := resourcesynccontroller.CombineCABundleConfigMaps(
resourcesynccontroller.ResourceLocation{Namespace: owner.Namespace, Name: pkimanifests.TotalKASClientCABundle(owner.Namespace).Name},
lister,
"HOSTEDCP", "Kubernetes total client CA bundle.",
certrotation.AdditionalAnnotations{
JiraComponent: "HOSTEDCP",
Description: "Kubernetes total client CA bundle.",
},
// this bundle is what this operator uses to mint new customer client certs it directly manages
resourcesynccontroller.ResourceLocation{Namespace: owner.Namespace, Name: pkimanifests.CustomerSystemAdminSignerCA(owner.Namespace).Name},
// this bundle is what this operator uses to mint new SRE client certs it directly manages
Expand Down
9 changes: 5 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ require (
github.com/onsi/gomega v1.33.1
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/openshift/api v0.0.0-20240214165302-89248c87b7fc
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
github.com/openshift/api v0.0.0-20240405095747-3e50337fcaea
github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8
github.com/openshift/cloud-credential-operator v0.0.0-20220708202639-ef451d260cf6
github.com/openshift/cluster-api-provider-agent/api v0.0.0-20230918065757-81658c4ddf2f
github.com/openshift/cluster-node-tuning-operator v0.0.0-20240131125539-0e319439e65a
github.com/openshift/hypershift/api v0.0.0-00010101000000-000000000000
github.com/openshift/library-go v0.0.0-20231214171439-128164517bf7
github.com/openshift/library-go v0.0.0-20240422143640-fad649cbbd63
github.com/operator-framework/api v0.22.0
github.com/pkg/errors v0.9.1
github.com/ppc64le-cloud/powervs-utils v0.0.0-20230306072409-bc42a581099f
Expand Down Expand Up @@ -132,7 +132,6 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.5 // indirect
Expand Down Expand Up @@ -188,6 +187,8 @@ require (
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opencontainers/runc v1.1.10 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // indirect
github.com/openshift/machine-config-operator v0.0.1-0.20230807154212-886c5c3fc7a9 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand Down
18 changes: 10 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -843,8 +843,6 @@ github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uq
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
Expand Down Expand Up @@ -1220,10 +1218,14 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/openshift/api v0.0.0-20240214165302-89248c87b7fc h1:/QQKBisQey7+qtKJS4fReHmXx/GyGRS8Tb+IU2WOMh0=
github.com/openshift/api v0.0.0-20240214165302-89248c87b7fc/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
github.com/openshift/api v0.0.0-20240405095747-3e50337fcaea h1:cjCo7sUIjL+Q2ZGMfLXzFb70K+77R52GVjh10fRhA1M=
github.com/openshift/api v0.0.0-20240405095747-3e50337fcaea/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8 h1:HGfbllzRcrJBSiwzNjBCs7sExLUxC5/1evnvlNGB0Cg=
github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8/go.mod h1:+VvvaMSTUhOt+rBq7NwRLSNxq06hTeRCBqm0j0PQEq8=
github.com/openshift/cloud-credential-operator v0.0.0-20220708202639-ef451d260cf6 h1:+hva5Mtz22jmpu9v7RlE1iVqHUZu72nRjmpV+eLNIGQ=
github.com/openshift/cloud-credential-operator v0.0.0-20220708202639-ef451d260cf6/go.mod h1:qTEqKytotRAu1/N5Grbfd0DGjD56EYk4zNsHg+4Hvlw=
github.com/openshift/cluster-api-provider-agent/api v0.0.0-20230918065757-81658c4ddf2f h1:YWIaRFHMNzxi26FbT0TE9zl4pBzfeiZjQJv0JUzibUc=
Expand All @@ -1232,8 +1234,8 @@ github.com/openshift/cluster-node-tuning-operator v0.0.0-20240131125539-0e319439
github.com/openshift/cluster-node-tuning-operator v0.0.0-20240131125539-0e319439e65a/go.mod h1:qlkF1WsiGKRDDyJVOj8HMBDHNY12GV6rrhIjnp4XQHk=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 h1:cHyxR+Y8rAMT6m1jQCaYGRwikqahI0OjjUDhFNf3ySQ=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
github.com/openshift/library-go v0.0.0-20231214171439-128164517bf7 h1:n8IAM02eWgY32s+XmHSpIg0UEe3QwBbNaXAxF9O8a7s=
github.com/openshift/library-go v0.0.0-20231214171439-128164517bf7/go.mod h1:0q1UIvboZXfSlUaK+08wsXYw4N6OUo2b/z3a1EWNGyw=
github.com/openshift/library-go v0.0.0-20240422143640-fad649cbbd63 h1:Cv1pmE4m2MJrytpTOk0HHJfaw7gvBOwAj8FJeGuffCg=
github.com/openshift/library-go v0.0.0-20240422143640-fad649cbbd63/go.mod h1:m/HsttSi90vSixwoy5mPUBHcZid2YRw/QbsLErLxF9s=
github.com/openshift/machine-config-operator v0.0.1-0.20230807154212-886c5c3fc7a9 h1:lEH5TQGyDjnJZocsI4FE0BcWKkKtqW3OOsBkRvGd9Rs=
github.com/openshift/machine-config-operator v0.0.1-0.20230807154212-886c5c3fc7a9/go.mod h1:kP51fbL8QBSY/mAkFicoF73x0QSraPrX4BjWIdzFPio=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1082,8 +1082,8 @@ func TestHostedClusterWatchesEverythingItCreates(t *testing.T) {
}

r.KubevirtInfraClients = kvinfra.NewMockKubevirtInfraClientMap(&createTypeTrackingClient{Client: fake.NewClientBuilder().WithScheme(api.Scheme).WithObjects(objects...).Build()},
"v1.0.0",
"1.27.0")
"v1.2.0",
"1.28.0")

ctrl.SetLogger(zap.New(zap.UseDevMode(true), zap.JSONEncoder(func(o *zapcore.EncoderConfig) {
o.EncodeTime = zapcore.RFC3339TimeEncoder
Expand Down Expand Up @@ -1696,18 +1696,18 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.15.0",
Image: "image-4.16.0",
},
},
},
},
expectedResult: errors.New(`y-stream downgrade from "4.15.0" to "4.14.0" is not supported`),
expectedResult: errors.New(`y-stream downgrade from "4.16.0" to "4.15.0" is not supported`),
},
{
name: "unsupported y-stream upgrade, error",
Expand All @@ -1728,18 +1728,18 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.11.0",
Image: "image-4.12.0",
},
},
},
},
expectedResult: errors.New(`y-stream upgrade from "4.11.0" to "4.14.0" is not for OpenShiftSDN`),
expectedResult: errors.New(`y-stream upgrade from "4.12.0" to "4.15.0" is not for OpenShiftSDN`),
},
{
name: "supported y-stream upgrade, success",
Expand All @@ -1760,13 +1760,13 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.11.0",
Image: "image-4.12.0",
},
},
},
Expand All @@ -1792,7 +1792,7 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
},
Expand All @@ -1817,13 +1817,13 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
},
Expand All @@ -1849,13 +1849,13 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.11.1",
Image: "image-4.12.1",
},
},
},
Expand All @@ -1881,13 +1881,13 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
Status: hyperv1.HostedClusterStatus{
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: "image-4.14.0",
Image: "image-4.15.0",
},
},
},
Expand Down Expand Up @@ -1918,7 +1918,7 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.11.0",
Image: "image-4.12.0",
},
},
},
Expand All @@ -1943,7 +1943,7 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.13.0",
Image: "image-4.14.0",
},

Platform: hyperv1.PlatformSpec{
Expand All @@ -1952,7 +1952,7 @@ func TestValidateReleaseImage(t *testing.T) {
},
},
},
expectedResult: errors.New(`the minimum version supported for platform KubeVirt is: "4.14.0". Attempting to use: "4.13.0"`),
expectedResult: errors.New(`the minimum version supported for platform KubeVirt is: "4.15.0". Attempting to use: "4.14.0"`),
},
{
name: "KubeVirt platform supported release, success",
Expand All @@ -1973,7 +1973,7 @@ func TestValidateReleaseImage(t *testing.T) {
Name: "pull-secret",
},
Release: hyperv1.Release{
Image: "image-4.15.0",
Image: "image-4.16.0",
},

Platform: hyperv1.PlatformSpec{
Expand All @@ -1995,15 +1995,15 @@ func TestValidateReleaseImage(t *testing.T) {
return &fakereleaseprovider.FakeReleaseProvider{
ImageVersion: map[string]string{
"image-4.7.0": "4.7.0",
"image-4.9.0": "4.9.0",
"image-4.10.0": "4.10.0",
"image-4.11.0": "4.11.0",
"image-4.11.1": "4.11.1",
"image-4.12.0": "4.12.0",
"image-4.12.1": "4.12.1",
"image-4.13.0": "4.13.0",
"image-4.14.0": "4.14.0",
"image-4.15.0": "4.15.0",
"image-4.16.0": "4.16.0",
"image-4.17.0": "4.17.0",
},
},
&fakeimagemetadataprovider.FakeImageMetadataProvider{
Expand Down Expand Up @@ -2156,9 +2156,9 @@ func TestDefaultClusterIDsIfNeeded(t *testing.T) {
}

func TestIsUpgradeable(t *testing.T) {
releaseImageFrom := "image-4.12"
releaseImageToZstream := "image-4.12.1"
releaseImageTo := "image-4.13"
releaseImageFrom := "image-4.13"
releaseImageToZstream := "image-4.13.1"
releaseImageTo := "image-4.14"
tests := []struct {
name string
hc *hyperv1.HostedCluster
Expand Down Expand Up @@ -2198,7 +2198,7 @@ func TestIsUpgradeable(t *testing.T) {
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: releaseImageFrom,
Version: "4.12.0",
Version: "4.13.0",
},
},
},
Expand All @@ -2221,7 +2221,7 @@ func TestIsUpgradeable(t *testing.T) {
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: releaseImageFrom,
Version: "4.12.0",
Version: "4.13.0",
},
},
Conditions: []metav1.Condition{
Expand Down Expand Up @@ -2255,7 +2255,7 @@ func TestIsUpgradeable(t *testing.T) {
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: releaseImageFrom,
Version: "4.12.0",
Version: "4.13.0",
},
},
Conditions: []metav1.Condition{
Expand Down Expand Up @@ -2313,7 +2313,7 @@ func TestIsUpgradeable(t *testing.T) {
Version: &hyperv1.ClusterVersionStatus{
Desired: configv1.Release{
Image: releaseImageFrom,
Version: "4.12.0",
Version: "4.13.0",
},
},
Conditions: []metav1.Condition{
Expand Down Expand Up @@ -2343,9 +2343,9 @@ func TestIsUpgradeable(t *testing.T) {
ReconcileMetadataProviders: func(ctx context.Context, imgOverrides map[string]string) (releaseinfo.ProviderWithOpenShiftImageRegistryOverrides, hyperutil.ImageMetadataProvider, error) {
return &fakereleaseprovider.FakeReleaseProvider{
ImageVersion: map[string]string{
"image-4.12": "4.12.0",
"image-4.12.1": "4.12.1",
"image-4.13": "4.14.0",
"image-4.13": "4.13.0",
"image-4.13.1": "4.13.1",
"image-4.14": "4.15.0",
},
},
&fakeimagemetadataprovider.FakeImageMetadataProvider{
Expand Down
Loading