diff --git a/tls.crt b/tls.crt new file mode 100644 index 0000000000..fc83ac8bab --- /dev/null +++ b/tls.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIIe7neVFYhm+swDQYJKoZIhvcNAQELBQAwRDESMBAGA1UE +CxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2aWNlLW5l +dHdvcmstc2lnbmVyMB4XDTI1MDkwNDExMTczOFoXDTM1MDkwMjExMTczOFowRDES +MBAGA1UECxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2 +aWNlLW5ldHdvcmstc2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEA4JAzAjXHWK/idRjIySdCVnDemD5O3um3UbnU4Ls8zH+ZfNz2wddgBI4/z19L +qQ8f7sXnGMYx+MawKA794c9nNzYTO2lvZpKhDS8wBe2AEM0wiUqAs9rOZ04r9sQd +312rOmEJzQP8yO4JkPK8N+LfIFIRIdnTiThG29tkyZZPlOdXXWM7Uv+1/BI6fHVM +bO6DYWBVmeAjYQhvXmL2i1J5+HQcRVQDtEmB8cBFgBuiDo1Me7AmegxpPxYpU55G +hFBFZquie4au/wcl2IAAOnv7op8Rv3FMdXfxcvEM7WD68hbEvHI9kzFdPx/L5uL+ +a2Rxk4WD6wZ7m9KGlvYIzo2edwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYD +VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUz3cMq9xAZLTSR7iv3xPjRouKPoswDQYJ +KoZIhvcNAQELBQADggEBAAyeuB/1ii/WwK4SamiVrBg3sV9U85icko3VMDUOTALv +JjMCtRBicFEJTtqLxfYUwz1EIXxxfW26UxZGgu/UWm4NVwLYrRk+f9AfzozfZsXu +uBuJ0p83cbBYWKVP8H3N8y0H9FFeMXWfM3ZRR1MVVvNgA4s/GPyprRB70FybbAhv +sbKNyFZHDCd0iQ9eZ9ZJCSARUl90uU7G6Ak0j+q/+YRQ2yMn3bBq84AXG37mJiAd +M0bGqIMJAh0B1xUZkgNsyB9DMfUwr1XW90LuLO+HzrEcKgO6TOYMl0olGQObhx3F +I7hos2ZVxP+UtQKIytuw49cIdM0aaKQ27YydcPmLib4= +-----END CERTIFICATE----- diff --git a/tls.key b/tls.key new file mode 100644 index 0000000000..ed6fc99ad6 --- /dev/null +++ b/tls.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA4JAzAjXHWK/idRjIySdCVnDemD5O3um3UbnU4Ls8zH+ZfNz2 +wddgBI4/z19LqQ8f7sXnGMYx+MawKA794c9nNzYTO2lvZpKhDS8wBe2AEM0wiUqA +s9rOZ04r9sQd312rOmEJzQP8yO4JkPK8N+LfIFIRIdnTiThG29tkyZZPlOdXXWM7 +Uv+1/BI6fHVMbO6DYWBVmeAjYQhvXmL2i1J5+HQcRVQDtEmB8cBFgBuiDo1Me7Am +egxpPxYpU55GhFBFZquie4au/wcl2IAAOnv7op8Rv3FMdXfxcvEM7WD68hbEvHI9 +kzFdPx/L5uL+a2Rxk4WD6wZ7m9KGlvYIzo2edwIDAQABAoIBAQCox5ie+56VqLRT +AErA7THt2C1lTcdnwU+YLEy0j+XVab4J2+XWsTKomeWZze0G5qhAhRv5QdWDPopd +wU7OLl1MYOc5izhAZsqHJ0U331aWyjHFrmpnQ3hIqrdeY+5z2Gn+mbqNDYcr2cT0 +3YvbkTfUifn4cEiOZO7VBeONo9yyc3mJqKWuGKaI/DXGlReRGOZQMV4ysnZaBja1 +iRkCmZ6JZWvcXnDn9ZRfDQijHt9nOpql141OAXt0LgjPKiAlPtJA//bnUOrH/FpY +kBn/PTTYFBF6hYJGz5+46OngWi4LNtKkVR4aLzayg/ZbBK2J24r/QOKq/oHbrDrx +HSOLKUmRAoGBAPCW0dA/5/wVWhu7PRnEO/0JA8q8G1XbggtjXxF1S8NuFlye4zff +uyNMjfGNOE8ed2I88dX0lbQgvbLFLOQSDsPCRuLhrbchUwR9wJiqC+sk09XKlkB7 +cg72t1W5ywkJJdm3zPbT8xn9dZLaqiD5pv9Va8BVlvSQEfqLslLYfvWvAoGBAO7y +lm6MM7hqrvVqxPwiQ2vkCeoy4WB/KnKeAwOByvBhYY06S4kseaQ0+yfeyaL0MP5E +iDc+ixwD26GBW0tyVtak0DpJDA/LafQk6umw0hVxX3okujeIcXbw/lf0pvQUj+hD +R1gz9gLtNN1mXjBKYtv54eTotGw7gk/tBCUuKt25AoGBAI1xDX6x42+3GdeN15kL +Xf0fzKPmvOdX+nc5f42i+Ny3Htxq6MhTdxCElDp7PKx/C86sZ7zSYySXzw6HjyGy +YA3EbKo75UXxiH3udEkMR5+BciyRQo48RMz5TMVQSkZQo3kA7rX520TfVrz0Yuqp ++vzHumZDq1CyVm+Gq1q7PsCvAoGAYrvKfRNhq6opcS8VBjoCMeqgTi2IAx+IoqO4 +CxLukDUs4fZcj+nYuYlK3kaoerT8KZSX1Hv7bzAI6MtStfIg/8BKaksUuNIMjd1T +VAzEQif+k7HpYFj4yXT7I8zrz59Pd2GVcVTHKp5pYbKS6NFT2CGAvd2J788HIY+G +Tvasr8ECgYB7gBuXQfViq2qqXYjn2R7/Petk7lsa/wnvxS2Eu2pSCyRGhY2MSAPh +nrCAOdBKQp+qHonr25iCF55WfOnraFSmCL/6HO9uDyDcTbJfO/XBhSZ9CaZEm3gZ +/To2cXnUiqwFfIGWS7PeF9i6gwWsSYt3Dpan9GsGDSK0L00laVHpbw== +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go index 80d0265a8d..df2dbb9b5e 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go @@ -7,6 +7,7 @@ import ( "math" "os" "path/filepath" + "sort" "strconv" "strings" "time" @@ -118,6 +119,7 @@ type InstallerController struct { podOperatorStatusApplied bool // resource version of the last StaticPodOperatorStatus applied lastPodOperatorAppliedRV uint64 + lastMissingEvent map[string]time.Time } // InstallerPodMutationFunc is a function that has a chance at changing the installer pod before it is created @@ -1119,7 +1121,23 @@ func (c InstallerController) ensureRequiredResourcesExist(ctx context.Context, r for _, err := range aggregatedErr.Errors() { eventMessages = append(eventMessages, err.Error()) } - c.eventRecorder.Warningf("RequiredInstallerResourcesMissing", strings.Join(eventMessages, ", ")) + sort.Strings(eventMessages) + key := strings.Join(eventMessages, ",") + + if c.lastMissingEvent == nil { + c.lastMissingEvent = make(map[string]time.Time) + } + + now := time.Now() + if c.now != nil { + now = c.now() + } + + if lastTime, exists := c.lastMissingEvent[key]; !exists || now.Sub(lastTime) > 30*time.Second { + c.eventRecorder.Warningf("RequiredInstallerResourcesMissing", strings.Join(eventMessages, ", ")) + c.lastMissingEvent[key] = now + } + return fmt.Errorf("missing required resources: %v", aggregatedErr) }