✨ Ensure docker registry CA is trusted in e2e tests #377
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ spec: | |
| matchLabels: | ||
| control-plane: catalogd-controller-manager | ||
| replicas: 1 | ||
| minReadySeconds: 5 | ||
|
There was a problem hiding this comment. Added this, because of frequent timing issues with webhooks coming online:
There was a problem hiding this comment. That does seem like a similar problem... |
||
| template: | ||
| metadata: | ||
| annotations: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package httputil | ||
|
|
||
| import ( | ||
| "crypto/x509" | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| ) | ||
|
|
||
| // Should share code from operator-controller. | ||
| // see: https://issues.redhat.com/browse/OPRUN-3535 | ||
| func NewCertPool(caDir string, log logr.Logger) (*x509.CertPool, error) { | ||
| caCertPool, err := x509.SystemCertPool() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if caDir == "" { | ||
| return caCertPool, nil | ||
| } | ||
|
|
||
| dirEntries, err := os.ReadDir(caDir) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| count := 0 | ||
|
|
||
| for _, e := range dirEntries { | ||
| file := filepath.Join(caDir, e.Name()) | ||
| // These might be symlinks pointing to directories, so use Stat() to resolve | ||
| fi, err := os.Stat(file) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if fi.IsDir() { | ||
| log.Info("skip directory", "name", e.Name()) | ||
| continue | ||
| } | ||
| log.Info("load certificate", "name", e.Name()) | ||
| data, err := os.ReadFile(file) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error reading cert file %q: %w", file, err) | ||
| } | ||
|
|
||
| if ok := caCertPool.AppendCertsFromPEM(data); ok { | ||
| count++ | ||
| } | ||
| } | ||
|
|
||
| // Found no certs! | ||
| if count == 0 { | ||
| return nil, fmt.Errorf("no certificates found in %q", caDir) | ||
| } | ||
|
|
||
| return caCertPool, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package httputil | ||
|
|
||
| import ( | ||
| "crypto/rand" | ||
| "crypto/rsa" | ||
| "crypto/x509" | ||
| "crypto/x509/pkix" | ||
| "encoding/pem" | ||
| "math/big" | ||
| "os" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/go-logr/logr/testr" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestNewCertPool(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| // set up our CA certificate | ||
| ca := &x509.Certificate{ | ||
| SerialNumber: big.NewInt(2019), | ||
| Subject: pkix.Name{ | ||
| Organization: []string{"Company, INC."}, | ||
| Country: []string{"US"}, | ||
| Province: []string{""}, | ||
| Locality: []string{"San Francisco"}, | ||
| StreetAddress: []string{"Golden Gate Bridge"}, | ||
| PostalCode: []string{"94016"}, | ||
| }, | ||
| NotBefore: time.Now(), | ||
| NotAfter: time.Now().AddDate(10, 0, 0), | ||
| IsCA: true, | ||
| ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, | ||
| KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, | ||
| BasicConstraintsValid: true, | ||
| } | ||
|
|
||
| // create our private and public key | ||
| caPrivKey, err := rsa.GenerateKey(rand.Reader, 4096) | ||
| require.NoError(t, err) | ||
|
|
||
| // create the CA | ||
| caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey) | ||
| require.NoError(t, err) | ||
|
|
||
| // pem encode | ||
| err = os.MkdirAll("testdata/newCertPool/subfolder", 0700) | ||
| require.NoError(t, err) | ||
| t.Cleanup(func() { | ||
| require.NoError(t, os.RemoveAll("testdata/newCertPool")) | ||
| }) | ||
|
|
||
| caPEM, err := os.Create("testdata/newCertPool/my.pem") | ||
| require.NoError(t, err) | ||
| err = pem.Encode(caPEM, &pem.Block{ | ||
| Type: "CERTIFICATE", | ||
| Bytes: caBytes, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = NewCertPool("testdata/newCertPool", testr.New(t)) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| func Test_newCertPool_empty(t *testing.T) { | ||
| err := os.MkdirAll("testdata/newCertPoolEmpty", 0700) | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = NewCertPool("testdata/newCertPoolEmpty", testr.New(t)) | ||
| require.EqualError(t, err, `no certificates found in "testdata/newCertPoolEmpty"`) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: reordering the targets just seems like churn?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The image-registry now depends on the OLM-ca Issuer being created before.
Otherwise the image-registry cert can't be created, which means the secret is missing, which means the image-registry Deployment never gets ready and the installation timeouts while waiting:
see:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, maybe we could use a comment about these target ordering needs then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added.