Skip to content

Updating ose-cluster-ingress-operator images to be consistent with ART #834

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 22, 2022
Merged

Updating ose-cluster-ingress-operator images to be consistent with ART #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.18-openshift-4.11
tag: rhel-8-release-golang-1.19-openshift-4.12
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder
WORKDIR /ingress-operator
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base
COPY --from=builder /ingress-operator/ingress-operator /usr/bin/
COPY manifests /manifests
ENTRYPOINT ["/usr/bin/ingress-operator"]
Expand Down
12 changes: 7 additions & 5 deletions pkg/manifests/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/operator/controller/certificate/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// The certificate controller is responsible for:
// The certificate controller is responsible for the following:
//
// 1. Managing a CA for minting self-signed certs
// 2. Managing self-signed certificates for any ingresscontrollers which require them
// 3. Publishing the CA to `openshift-config-managed`
// 1. Managing a CA for minting self-signed certs.
// 2. Managing self-signed certificates for any ingresscontrollers which require them.
// 3. Publishing the CA to the openshift-config-managed namespace.
package certificate

import (
Expand Down
26 changes: 14 additions & 12 deletions pkg/util/aws/shared_credentials_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ import (
corev1 "k8s.io/api/core/v1"
)

// SharedCredentialsFileFromSecret returns a location (path) to the shared credentials file that was created
// using the provided secret.
// Consumers can configure the aws Session using that file to use the credentials like,
// SharedCredentialsFileFromSecret returns a location (path) to the shared
// credentials file that was created using the provided secret.
//
// sharedCredentialsFile, err := SharedCredentialsFileFromSecret(secret)
// if err != nil {
// // handle error
// }
// options := session.Options{
// SharedConfigState: session.SharedConfigEnable,
// SharedConfigFiles: []string{sharedCredentialsFile},
// }
// sess := session.Must(session.NewSessionWithOptions(options))
// Consumers can configure the aws Session using that file to use the
// credentials as follows:
//
// sharedCredentialsFile, err := SharedCredentialsFileFromSecret(secret)
// if err != nil {
// // handle error
// }
//
// options := session.Options{
// SharedConfigState: session.SharedConfigEnable,
// SharedConfigFiles: []string{sharedCredentialsFile},
// }
// sess := session.Must(session.NewSessionWithOptions(options))
func SharedCredentialsFileFromSecret(secret *corev1.Secret) (string, error) {
var data []byte
switch {
Expand Down
9 changes: 2 additions & 7 deletions test/e2e/maxconn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,8 @@ func TestTunableMaxConnectionsValidValues(t *testing.T) {
// TestTunableMaxConnectionsInvalidValues tests that invalid values
// cannot be set for tuningOptions.maxConnections.
//
// Valid values are:
// 0
// -1
// 2000-2000000
//
// so we test outside of those value and expect validation failures
// when we attempt to set them.
// Valid values are 0, -1, and 2000-2000000, so we test outside of those value
// and expect validation failures when we attempt to set them.
func TestTunableMaxConnectionsInvalidValues(t *testing.T) {
t.Parallel()
updateMaxConnections := func(t *testing.T, client client.Client, maxConnections int32, name types.NamespacedName) error {
Expand Down