Merge pull request #720 from deads2k/apply-08-produces-start

API-1835: adds `output-resources` to cluster-authentication operator.

Author: openshift-merge-bot[bot]

cmd/authentication-operator/main.go

@@ -3,13 +3,11 @@ package main
 import (
 	"os"
 
+	"github.com/openshift/cluster-authentication-operator/pkg/cmd/mom"
+	"github.com/openshift/cluster-authentication-operator/pkg/cmd/operator"
 	"github.com/spf13/cobra"
-
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/component-base/cli"
-
-	"github.com/openshift/cluster-authentication-operator/pkg/cmd/mom"
-	"github.com/openshift/cluster-authentication-operator/pkg/cmd/operator"
 )
 
 func main() {
@@ -34,6 +32,7 @@ func NewAuthenticationOperatorCommand() *cobra.Command {
 
 	cmd.AddCommand(operator.NewOperator())
 	cmd.AddCommand(mom.NewApplyConfigurationCommand(ioStreams))
+	cmd.AddCommand(mom.NewOutputResourcesCommand(ioStreams))
 
 	return cmd
 }

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
 	github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
 	github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
-	github.com/openshift/library-go v0.0.0-20241021151851-4c5ecb35c294
-	github.com/openshift/multi-operator-manager v0.0.0-20241017140751-8b22f6c45da3
+	github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39
+	github.com/openshift/multi-operator-manager v0.0.0-20241022160113-b880eaae93fc
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
 	go.etcd.io/etcd/client/v3 v3.5.14

go.sum

@@ -148,10 +148,10 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
 github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
-github.com/openshift/library-go v0.0.0-20241021151851-4c5ecb35c294 h1:wz02/A1CsKVqNJD+Yg4NLw9SnNpGX9JK5lEb4qxM81k=
-github.com/openshift/library-go v0.0.0-20241021151851-4c5ecb35c294/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
-github.com/openshift/multi-operator-manager v0.0.0-20241017140751-8b22f6c45da3 h1:/rOm5CjL8W8sSeSzf/bg8wySP98+juT2SbVhBhmROLo=
-github.com/openshift/multi-operator-manager v0.0.0-20241017140751-8b22f6c45da3/go.mod h1:7u7Wj5yctFzwixEJdrnpZCCNuJwdwls3SwqHoxRlN7E=
+github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39 h1:QUoMgNRHKDX0BXCbsdYHwoIyqYBGSJy9dNBAph9WqEU=
+github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
+github.com/openshift/multi-operator-manager v0.0.0-20241022160113-b880eaae93fc h1:DPatMo6iid7ruxVr3LEu0EHe3oll9CYZYO4A8vV3RYU=
+github.com/openshift/multi-operator-manager v0.0.0-20241022160113-b880eaae93fc/go.mod h1:7u7Wj5yctFzwixEJdrnpZCCNuJwdwls3SwqHoxRlN7E=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

pkg/cmd/mom/apply_configuration_command.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/openshift/cluster-authentication-operator/pkg/operator"
-
 	"github.com/openshift/multi-operator-manager/pkg/library/libraryapplyconfiguration"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericiooptions"

pkg/cmd/mom/output_resources_command.go

@@ -0,0 +1,68 @@
+package mom
+
+import (
+	"context"
+
+	"github.com/openshift/multi-operator-manager/pkg/library/libraryoutputresources"
+	"github.com/spf13/cobra"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
+)
+
+func NewOutputResourcesCommand(streams genericiooptions.IOStreams) *cobra.Command {
+	return libraryoutputresources.NewOutputResourcesCommand(RunOutputResources, streams)
+}
+
+func RunOutputResources(ctx context.Context) (*libraryoutputresources.OutputResources, error) {
+	return &libraryoutputresources.OutputResources{
+		ConfigurationResources: libraryoutputresources.ResourceList{
+			ExactResources: []libraryoutputresources.ExactResource{
+				exactResource("config.openshift.io", "ingresses", "", "cluster"),
+			},
+		},
+		ManagementResources: libraryoutputresources.ResourceList{
+			ExactResources: []libraryoutputresources.ExactResource{
+				exactResource("config.openshift.io", "clusteroperators", "", "authentication"),
+				exactResource("openshift.openshift.io", "authentications", "", "cluster"),
+			},
+		},
+		UserWorkloadResources: libraryoutputresources.ResourceList{
+			ExactResources: []libraryoutputresources.ExactResource{
+				exactResource("", "secrets", "openshift-authentication", "v4-0-config-system-session"),
+				exactResource("", "secrets", "openshift-authentication", "v4-0-config-system-ocp-branding-template"),
+				exactResource("", "serviceaccounts", "openshift-authentication", "oauth-openshift"),
+				exactResource("apps", "deployments", "openshift-authentication", "oauth-openshift"),
+				exactResource("oauth.openshift.io", "oauthclients", "", "openshift-browser-client"),
+				exactResource("oauth.openshift.io", "oauthclients", "", "openshift-challenging-client"),
+				exactResource("oauth.openshift.io", "oauthclients", "", "openshift-cli-client"),
+				exactResource("rbac.authorization.k8s.io", "clusterrolebindings", "", "system:openshift:openshift-authentication"),
+				exactResource("rbac.authorization.k8s.io", "rolebindings", "openshift-config-managed", "system:openshift:oauth-servercert-trust"),
+				exactResource("rbac.authorization.k8s.io", "roles", "openshift-config-managed", "system:openshift:oauth-servercert-trust"),
+			},
+			GeneratedNameResources: []libraryoutputresources.GeneratedNameResource{
+				generatedResource("certificates.k8s.io", "certificatesigningrequests", "", "system:openshift:openshift-authenticator-"),
+			},
+		},
+	}, nil
+}
+
+func exactResource(group, resource, namespace, name string) libraryoutputresources.ExactResource {
+	return libraryoutputresources.ExactResource{
+		OutputResourceTypeIdentifier: libraryoutputresources.OutputResourceTypeIdentifier{
+			Group:    group,
+			Resource: resource,
+		},
+		Namespace: namespace,
+		Name:      name,
+	}
+}
+
+func generatedResource(group, resource, namespace, name string) libraryoutputresources.GeneratedNameResource {
+	return libraryoutputresources.GeneratedNameResource{
+		OutputResourceTypeIdentifier: libraryoutputresources.OutputResourceTypeIdentifier{
+			Group:    group,
+			Resource: resource,
+		},
+		Namespace:     namespace,
+		GeneratedName: name,
+	}
+}