diff --git a/cmd/globaldns.go b/cmd/globaldns.go deleted file mode 100644 index 9caa34a1..00000000 --- a/cmd/globaldns.go +++ /dev/null @@ -1,933 +0,0 @@ -package cmd - -import ( - "errors" - "fmt" - "strings" - - "github.com/rancher/cli/cliclient" - managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" -) - -const ( - alidnsProvider = "alidns" - cloudflareProvider = "cloudflare" - route53Provider = "route53" - - envAlibabaCloudAccessKey = "ALI_ACCESS_KEY_ID" - envAlibabaCloudSecretKey = "ALI_ACCESS_KEY_SECRET" - envAwsAccessKey = "AWS_ACCESS_KEY_ID" - envAwsSecretKey = "AWS_SECRET_ACCESS_KEY" - envCloudflareAPIEmail = "CF_API_EMAIL" - envCloudflareAPIKey = "CF_API_KEY" - - argAlibabaCloudAccessKey = "alibabacloud-access-key-id" - argAlibabaCloudSecretKey = "alibabacloud-access-key-secret" - argAwsAccessKey = "aws-access-key" - argAwsSecretKey = "aws-secret-key" - argCloudflareAPIEmail = "cloudflare-api-email" - argCloudflareAPIKey = "cloudflare-api-key" - - argFQDN = "fqdn" - argMember = "member" - argMultiClusterApp = "multi-cluster-app" - argProject = "project" - argProvider = "provider" - argRootDomain = "root-domain" - argTTL = "ttl" - argType = "type" - - memberAccessTypeOwner = "owner" -) - -type globalDNSHolder struct { - ID string - Provider managementClient.GlobalDnsProvider - Entry managementClient.GlobalDns - Target string -} - -var globalDNSProviderCredentialFlags = []cli.Flag{ - cli.StringFlag{ - Name: argAlibabaCloudAccessKey, - EnvVar: envAlibabaCloudAccessKey, - Usage: "Alibaba Cloud access key ID for alidns provider", - }, - cli.StringFlag{ - Name: argAlibabaCloudSecretKey, - EnvVar: envAlibabaCloudSecretKey, - Usage: "Alibaba Cloud access key secret for alidns provider", - }, - cli.StringFlag{ - Name: argAwsAccessKey, - EnvVar: envAwsAccessKey, - Usage: "AWS access key for route53 provider", - }, - cli.StringFlag{ - Name: argAwsSecretKey, - EnvVar: envAwsSecretKey, - Usage: "AWS secret key for route53 provider", - }, - cli.StringFlag{ - Name: argCloudflareAPIEmail, - EnvVar: envCloudflareAPIEmail, - Usage: "API email for Cloudflare provider", - }, - cli.StringFlag{ - Name: argCloudflareAPIKey, - EnvVar: envCloudflareAPIKey, - Usage: "API key for Cloudflare provider", - }, -} - -func GlobalDNSCommand() cli.Command { - return cli.Command{ - Name: "globaldns", - Usage: "Operations on global DNS providers and entries", - Subcommands: []cli.Command{ - { - Name: "providers", - Aliases: []string{"provider"}, - Usage: "Operations on global DNS providers", - Action: defaultAction(globalDNSProviderLs), - Subcommands: []cli.Command{ - { - Name: "ls", - Usage: "List global DNS providers", - Action: globalDNSProviderLs, - Flags: []cli.Flag{ - formatFlag, - quietFlag, - }, - }, - { - Name: "create", - Usage: "Create a global DNS provider", - Action: globalDNSProviderCreate, - ArgsUsage: "[NAME]", - Flags: append([]cli.Flag{ - cli.StringFlag{ - Name: argType, - Usage: "Global DNS provider type, available options are \"alidns\", \"cloudflare\" and \"route53\"", - }, - cli.StringFlag{ - Name: argRootDomain, - Usage: "Set root domain of a global DNS provider", - }, - cli.StringSliceFlag{ - Name: argMember, - Usage: "Set members of the global DNS provider, can be used multiple times", - }, - }, globalDNSProviderCredentialFlags...), - }, - { - Name: "update", - Usage: "Update a global DNS provider", - Action: globalDNSProviderUpdate, - ArgsUsage: "[PROVIDER_NAME/PROVIDER_ID]", - Flags: append([]cli.Flag{ - cli.StringFlag{ - Name: argRootDomain, - Usage: "Set root domain of a global DNS provider", - }, - }, globalDNSProviderCredentialFlags...), - }, - { - Name: "delete", - Aliases: []string{"rm"}, - Usage: "Delete a global DNS provider", - Action: globalDNSProviderDelete, - ArgsUsage: "[PROVIDER_NAME/PROVIDER_ID...]", - }, - { - Name: "list-members", - Aliases: []string{"lm"}, - Usage: "List members of a global DNS provider", - Action: listGlobalDNSProviderMembers, - ArgsUsage: "[PROVIDER_NAME/PROVIDER_ID]", - Flags: []cli.Flag{ - formatFlag, - }, - }, - { - Name: "add-member", - Usage: "Add members to a global DNS provider", - Action: addGlobalDNSProviderMembers, - ArgsUsage: "[PROVIDER_NAME/PROVIDER_ID, USER_NAME/USER_ID...]", - }, - { - Name: "delete-member", - Usage: "Delete members from a global DNS provider", - Action: deleteGlobalDNSProviderMembers, - ArgsUsage: "[PROVIDER_NAME/PROVIDER_ID, USER_NAME/USER_ID...]", - }, - }, - }, - { - Name: "entries", - Aliases: []string{"entry"}, - Usage: "Operations on global DNS entries", - Action: defaultAction(globalDNSLs), - Subcommands: []cli.Command{ - { - Name: "ls", - Usage: "List global DNS entries", - Action: globalDNSLs, - Flags: []cli.Flag{ - formatFlag, - quietFlag, - }, - }, - { - Name: "create", - Usage: "Create a global DNS entry", - Action: globalDNSCreate, - Flags: []cli.Flag{ - cli.StringFlag{ - Name: argFQDN, - Usage: "FQDN of a global DNS entry", - }, - cli.Int64Flag{ - Name: argTTL, - Usage: "DNS TTL in seconds", - Value: 300, - }, - cli.StringFlag{ - Name: argProvider, - Usage: "Global DNS provider for an entry. Run \"rancher globaldns provider ls\" to see available ones", - }, - cli.StringFlag{ - Name: argMultiClusterApp, - Usage: "Set a multi-cluster app as the target to which a global DNS entry resolves", - }, - cli.StringSliceFlag{ - Name: argProject, - Usage: "Set projects as the target to which a global DNS entry resolves, can be used multiple times", - }, - cli.StringSliceFlag{ - Name: argMember, - Usage: "Set members of a global DNS entry, can be used multiple times", - }, - }, - }, - { - Name: "update", - Usage: "Update a global DNS entry", - Action: globalDNSUpdate, - ArgsUsage: "[ENTRY_ID]", - Flags: []cli.Flag{ - cli.StringFlag{ - Name: argFQDN, - Usage: "FQDN of a global DNS entry", - }, - cli.Int64Flag{ - Name: argTTL, - Usage: "DNS TTL in seconds", - Value: 300, - }, - cli.StringFlag{ - Name: argProvider, - Usage: "Global DNS provider for an entry. Run \"rancher globaldns provider ls\" to see available ones", - }, - cli.StringFlag{ - Name: argMultiClusterApp, - Usage: "Set a multi-cluster app as the target to which a global DNS entry resolves", - }, - }, - }, - { - Name: "delete", - Aliases: []string{"rm"}, - Usage: "Delete global DNS entries", - Action: globalDNSDelete, - ArgsUsage: "[ENTRY_ID...]", - }, - { - Name: "list-members", - Aliases: []string{"lm"}, - Usage: "List members of a global DNS entry", - Action: listGlobalDNSMembers, - ArgsUsage: "[ENTRY_ID]", - Flags: []cli.Flag{ - formatFlag, - }, - }, - { - Name: "add-member", - Usage: "Add members to a global DNS entry", - Action: addGlobalDNSMembers, - ArgsUsage: "[ENTRY_ID, USER_NAME/USER_ID...]", - }, - { - Name: "delete-member", - Usage: "Delete members from a global DNS entry", - Action: deleteGlobalDNSMembers, - ArgsUsage: "[ENTRY_ID, USER_NAME/USER_ID...]", - }, - { - Name: "add-project", - Usage: "Add target projects to a global DNS entry", - Description: "If the global DNS entry uses a multi-cluster app as the target, it will remove " + - "the multi-cluster app target and take the newly added projects as the target", - Action: addGlobalDNSProjects, - ArgsUsage: "[ENTRY_ID, PROJECT_NAME/PROJECT_ID...]", - }, - { - Name: "delete-project", - Usage: "Delete target projects from a global DNS entry", - Action: deleteGlobalDNSProjects, - ArgsUsage: "[ENTRY_ID, PROJECT_NAME/PROJECT_ID...]", - }, - }, - }, - }, - } -} - -func globalDNSProviderLs(ctx *cli.Context) error { - c, err := GetClient(ctx) - if err != nil { - return err - } - - providers, err := c.ManagementClient.GlobalDnsProvider.List(defaultListOpts(ctx)) - if err != nil { - return err - } - - writer := NewTableWriter([][]string{ - {"ID", "ID"}, - {"NAME", "Provider.Name"}, - {"ROOT_DOMAIN", "Provider.RootDomain"}, - {"CREATED", "Provider.Created"}, - }, ctx) - - defer writer.Close() - - for _, provider := range providers.Data { - writer.Write(&globalDNSHolder{ - ID: provider.ID, - Provider: provider, - }) - } - return writer.Err() -} - -func listGlobalDNSProviderMembers(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - provider, err := searchForGlobalDNSProvider(c, ctx.Args().First()) - if err != nil { - return err - } - - return outputMembers(ctx, c, provider.Members) -} - -func globalDNSProviderCreate(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - name := ctx.Args().First() - providerType := strings.ToLower(ctx.String(argType)) - rootDomain := ctx.String(argRootDomain) - - if providerType == "" { - return errors.New("--type is required") - } - - provider := &managementClient.GlobalDnsProvider{ - Name: name, - RootDomain: rootDomain, - } - switch providerType { - case route53Provider: - accessKey := ctx.String(argAwsAccessKey) - if accessKey == "" { - return errors.New("AWS access key is required for route53 type") - } - secretKey := ctx.String(argAwsSecretKey) - if secretKey == "" { - return errors.New("AWS secret key is required for route53 type") - } - provider.Route53ProviderConfig = &managementClient.Route53ProviderConfig{ - AccessKey: accessKey, - SecretKey: secretKey, - } - case cloudflareProvider: - apiEmail := ctx.String(argCloudflareAPIEmail) - if apiEmail == "" { - return errors.New("API email is required for cloudflare type") - } - apiKey := ctx.String(argCloudflareAPIKey) - if apiKey == "" { - return errors.New("API key is required for cloudflare type") - } - provider.CloudflareProviderConfig = &managementClient.CloudflareProviderConfig{ - APIEmail: apiEmail, - APIKey: apiKey, - } - case alidnsProvider: - accessKey := ctx.String(argAlibabaCloudAccessKey) - if accessKey == "" { - return errors.New("Alibaba Cloud access key ID is required for alidns type") - } - secretKey := ctx.String(argAlibabaCloudSecretKey) - if secretKey == "" { - return errors.New("Alibaba Cloud access key secret is required for alidns type") - } - provider.AlidnsProviderConfig = &managementClient.AlidnsProviderConfig{ - AccessKey: accessKey, - SecretKey: secretKey, - } - default: - return fmt.Errorf("unsupported provider type %q", providerType) - } - - members, err := addMembersByNames(ctx, c, provider.Members, ctx.StringSlice(argMember), memberAccessTypeOwner) - if err != nil { - return err - } - provider.Members = members - - if _, err = c.ManagementClient.GlobalDnsProvider.Create(provider); nil != err { - return err - } - - fmt.Printf("Successfully created global DNS provider %q\n", name) - return nil -} - -func globalDNSProviderUpdate(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - name := ctx.Args().First() - - provider, err := searchForGlobalDNSProvider(c, name) - if err != nil { - return err - } - - update := make(map[string]interface{}) - - if ctx.IsSet(argRootDomain) { - update["rootDomain"] = ctx.String(argRootDomain) - } - - if provider.Route53ProviderConfig != nil { - accessKey := ctx.String(argAwsAccessKey) - if accessKey != "" { - provider.Route53ProviderConfig.AccessKey = accessKey - } - - secretKey := ctx.String(argAwsSecretKey) - if secretKey != "" { - provider.Route53ProviderConfig.SecretKey = secretKey - } - - update["route53ProviderConfig"] = provider.Route53ProviderConfig - } else if provider.CloudflareProviderConfig != nil { - apiEmail := ctx.String(argCloudflareAPIEmail) - if apiEmail != "" { - provider.CloudflareProviderConfig.APIEmail = apiEmail - } - - apiKey := ctx.String(argCloudflareAPIKey) - if apiKey != "" { - provider.CloudflareProviderConfig.APIKey = apiKey - } - - update["cloudflareProviderConfig"] = provider.CloudflareProviderConfig - } else if provider.AlidnsProviderConfig != nil { - accessKey := ctx.String(argAlibabaCloudAccessKey) - if accessKey != "" { - provider.AlidnsProviderConfig.AccessKey = accessKey - } - - secretKey := ctx.String(argAlibabaCloudSecretKey) - if secretKey != "" { - provider.AlidnsProviderConfig.SecretKey = secretKey - } - - update["alidnsProviderConfig"] = provider.AlidnsProviderConfig - } else { - return fmt.Errorf("unsupported provider type for %q", name) - } - - _, err = c.ManagementClient.GlobalDnsProvider.Update(provider, update) - return err -} - -func globalDNSProviderDelete(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - for _, name := range ctx.Args() { - provider, err := searchForGlobalDNSProvider(c, name) - if err != nil { - return err - } - - if err = c.ManagementClient.GlobalDnsProvider.Delete(provider); nil != err { - return err - } - } - - return nil -} - -func addGlobalDNSProviderMembers(ctx *cli.Context) error { - if ctx.NArg() < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - provider, err := searchForGlobalDNSProvider(c, ctx.Args().First()) - if err != nil { - return err - } - - members, err := addMembersByNames(ctx, c, provider.Members, ctx.Args()[1:], memberAccessTypeOwner) - if err != nil { - return err - } - - update := make(map[string][]managementClient.Member) - update["members"] = members - - _, err = c.ManagementClient.GlobalDnsProvider.Update(provider, update) - return err -} - -func deleteGlobalDNSProviderMembers(ctx *cli.Context) error { - if ctx.NArg() < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - provider, err := searchForGlobalDNSProvider(c, ctx.Args().First()) - if err != nil { - return err - } - - members, err := deleteMembersByNames(ctx, c, provider.Members, ctx.Args()[1:]) - if err != nil { - return err - } - - update := make(map[string]interface{}) - update["members"] = members - - _, err = c.ManagementClient.GlobalDnsProvider.Update(provider, update) - return err -} - -func globalDNSLs(ctx *cli.Context) error { - c, err := GetClient(ctx) - if err != nil { - return err - } - - entries, err := c.ManagementClient.GlobalDns.List(defaultListOpts(ctx)) - if err != nil { - return err - } - - writer := NewTableWriter([][]string{ - {"ID", "ID"}, - {"FQDN", "Entry.FQDN"}, - {"PROVIDER_ID", "Entry.ProviderID"}, - {"TARGET", "Target"}, - {"CREATED", "Entry.Created"}, - }, ctx) - - defer writer.Close() - - clusterCache, projectCache, err := getClusterProjectMap(ctx, c.ManagementClient) - if err != nil { - return err - } - - for _, entry := range entries.Data { - target, err := getEntryTarget(c, clusterCache, projectCache, &entry) - if err != nil { - return err - } - writer.Write(&globalDNSHolder{ - ID: entry.ID, - Entry: entry, - Target: target, - }) - } - return writer.Err() -} - -func getEntryTarget(c *cliclient.MasterClient, clusterCache map[string]managementClient.Cluster, projectCache map[string]managementClient.Project, entry *managementClient.GlobalDns) (string, error) { - var target string - if entry.MultiClusterAppID != "" { - _, app, err := searchForMcapp(c, entry.MultiClusterAppID) - if err != nil { - return "", err - } - target = fmt.Sprintf("Multi Cluster App: %s", app.Name) - } else { - var targets []managementClient.Target - for _, projectID := range entry.ProjectIDs { - targets = append(targets, managementClient.Target{ - ProjectID: projectID, - }) - } - targetNames := getReadableTargetNames(clusterCache, projectCache, targets) - target = strings.Join(targetNames, ",") - } - return target, nil -} - -func listGlobalDNSMembers(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - - return outputMembers(ctx, c, entry.Members) -} - -func globalDNSCreate(ctx *cli.Context) error { - c, err := GetClient(ctx) - if err != nil { - return err - } - - fqdn := ctx.String(argFQDN) - provider := ctx.String(argProvider) - appName := ctx.String(argMultiClusterApp) - projects := ctx.StringSlice(argProject) - ttl := ctx.Int64(argTTL) - - if fqdn == "" { - return errors.New("--fqdn is required") - } - - if provider == "" { - return errors.New("--provider is required") - } - - if appName != "" && len(projects) > 0 || appName == "" && len(projects) == 0 { - return fmt.Errorf("please specify either --multi-cluster-app or --project as the global DNS entry target") - } - - entry := &managementClient.GlobalDns{ - FQDN: fqdn, - TTL: ttl, - } - - globalDNSProvider, err := searchForGlobalDNSProvider(c, provider) - if err != nil { - return err - } - entry.ProviderID = globalDNSProvider.ID - - members, err := addMembersByNames(ctx, c, entry.Members, ctx.StringSlice(argMember), memberAccessTypeOwner) - if err != nil { - return err - } - entry.Members = members - - if appName != "" { - resource, err := Lookup(c, appName, managementClient.MultiClusterAppType) - if err != nil { - return err - } - entry.MultiClusterAppID = resource.ID - } else { - projectIDs, err := lookupProjectIDsFromTargets(c, projects) - if err != nil { - return err - } - entry.ProjectIDs = projectIDs - } - - if _, err = c.ManagementClient.GlobalDns.Create(entry); nil != err { - return err - } - - fmt.Printf("Successfully created global DNS entry for %q\n", fqdn) - return nil -} - -func globalDNSUpdate(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - - update := make(map[string]interface{}) - - if ctx.IsSet(argFQDN) { - update["fqdn"] = ctx.String(argFQDN) - } - - if ctx.IsSet(argProvider) { - globalDNSProvider, err := searchForGlobalDNSProvider(c, ctx.String(argProvider)) - if err != nil { - return err - } - update["providerId"] = globalDNSProvider.ID - } - - if ctx.IsSet(argMultiClusterApp) { - resource, err := Lookup(c, ctx.String(argMultiClusterApp), managementClient.MultiClusterAppType) - if err != nil { - return err - } - update["multiClusterAppId"] = resource.ID - if len(entry.ProjectIDs) > 0 { - input := &managementClient.UpdateGlobalDNSTargetsInput{ - ProjectIDs: entry.ProjectIDs, - } - if err := c.ManagementClient.GlobalDns.ActionRemoveProjects(entry, input); err != nil { - return err - } - } - } - - if ctx.IsSet(argTTL) { - update["ttl"] = ctx.Int64(argTTL) - } - - if _, err := c.ManagementClient.GlobalDns.Update(entry, update); err != nil { - // Rollback target projects on update failure - if ctx.IsSet(argMultiClusterApp) && len(entry.ProjectIDs) > 0 { - input := &managementClient.UpdateGlobalDNSTargetsInput{ - ProjectIDs: entry.ProjectIDs, - } - if rbErr := c.ManagementClient.GlobalDns.ActionAddProjects(entry, input); rbErr != nil { - return fmt.Errorf("failed to update global DNS entry: %v and failed to rollback to previous target projects: %v", err, rbErr) - } - } - return err - } - return nil -} - -func globalDNSDelete(ctx *cli.Context) error { - if ctx.NArg() == 0 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - for _, name := range ctx.Args() { - entry, err := searchForGlobalDNS(c, name) - if err != nil { - return err - } - - if err = c.ManagementClient.GlobalDns.Delete(entry); nil != err { - return err - } - } - - return nil -} - -func addGlobalDNSMembers(ctx *cli.Context) error { - if ctx.NArg() < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - members, err := addMembersByNames(ctx, c, entry.Members, ctx.Args()[1:], memberAccessTypeOwner) - if err != nil { - return err - } - - update := make(map[string]interface{}) - update["members"] = members - - _, err = c.ManagementClient.GlobalDns.Update(entry, update) - return err -} - -func deleteGlobalDNSMembers(ctx *cli.Context) error { - if ctx.NArg() < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - - members, err := deleteMembersByNames(ctx, c, entry.Members, ctx.Args()[1:]) - if err != nil { - return err - } - - update := make(map[string]interface{}) - update["members"] = members - - _, err = c.ManagementClient.GlobalDns.Update(entry, update) - return err -} - -func deleteGlobalDNSProjects(ctx *cli.Context) error { - if len(ctx.Args()) < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - - targets := ctx.Args()[1:] - projectIDs, err := lookupProjectIDsFromTargets(c, targets) - if err != nil { - return err - } - - input := &managementClient.UpdateGlobalDNSTargetsInput{ - ProjectIDs: projectIDs, - } - - return c.ManagementClient.GlobalDns.ActionRemoveProjects(entry, input) -} - -func addGlobalDNSProjects(ctx *cli.Context) error { - if len(ctx.Args()) < 2 { - return cli.ShowSubcommandHelp(ctx) - } - - c, err := GetClient(ctx) - if err != nil { - return err - } - - entry, err := searchForGlobalDNS(c, ctx.Args().First()) - if err != nil { - return err - } - - targets := ctx.Args()[1:] - projectIDs, err := lookupProjectIDsFromTargets(c, targets) - if err != nil { - return err - } - - update := make(map[string]interface{}) - if entry.MultiClusterAppID != "" { - update["multiClusterAppId"] = "" - if _, err := c.ManagementClient.GlobalDns.Update(entry, update); err != nil { - return err - } - } - - input := &managementClient.UpdateGlobalDNSTargetsInput{ - ProjectIDs: projectIDs, - } - - if err := c.ManagementClient.GlobalDns.ActionAddProjects(entry, input); err != nil { - // Rollback target mcapp on add-project failure - if entry.MultiClusterAppID != "" { - update["multiClusterAppId"] = entry.MultiClusterAppID - if _, rbErr := c.ManagementClient.GlobalDns.Update(entry, update); rbErr != nil { - return fmt.Errorf("failed to add target projects to the entry: %v and failed to rollback to previous multi-cluster app target: %v", err, rbErr) - } - } - return err - } - return nil -} - -func searchForGlobalDNSProvider(c *cliclient.MasterClient, name string) (*managementClient.GlobalDnsProvider, error) { - resource, err := Lookup(c, name, managementClient.GlobalDnsProviderType) - if err != nil { - return nil, err - } - - return c.ManagementClient.GlobalDnsProvider.ByID(resource.ID) -} - -func searchForGlobalDNS(c *cliclient.MasterClient, name string) (*managementClient.GlobalDns, error) { - resource, err := Lookup(c, name, managementClient.GlobalDnsType) - if err != nil { - return nil, err - } - - return c.ManagementClient.GlobalDns.ByID(resource.ID) -} diff --git a/go.mod b/go.mod index bbefe264..14be8cd9 100644 --- a/go.mod +++ b/go.mod @@ -4,25 +4,25 @@ go 1.23.0 toolchain go1.23.1 -replace k8s.io/client-go => k8s.io/client-go v0.30.1 +replace k8s.io/client-go => k8s.io/client-go v0.31.1 require ( github.com/ghodss/yaml v1.0.0 github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b github.com/hashicorp/go-version v1.2.1 github.com/pkg/errors v0.9.1 - github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 - github.com/rancher/rancher/pkg/apis v0.0.0-20240717211851-7df10c297f33 - github.com/rancher/rancher/pkg/client v0.0.0-20240717211851-7df10c297f33 + github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab + github.com/rancher/rancher/pkg/apis v0.0.0-20241119020906-df45e368c82d + github.com/rancher/rancher/pkg/client v0.0.0-20241119020906-df45e368c82d github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.17.0 github.com/urfave/cli v1.22.5 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a - golang.org/x/oauth2 v0.21.0 - golang.org/x/sync v0.7.0 - golang.org/x/term v0.22.0 - golang.org/x/text v0.16.0 + golang.org/x/oauth2 v0.23.0 + golang.org/x/sync v0.8.0 + golang.org/x/term v0.25.0 + golang.org/x/text v0.19.0 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/yaml.v2 v2.4.0 k8s.io/client-go v12.0.0+incompatible @@ -31,21 +31,22 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/websocket v1.5.1 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -55,38 +56,38 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.19.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect - github.com/rancher/aks-operator v1.9.0-rc.9 // indirect - github.com/rancher/eks-operator v1.9.0-rc.11 // indirect - github.com/rancher/fleet/pkg/apis v0.10.0 // indirect - github.com/rancher/gke-operator v1.9.0-rc.8 // indirect - github.com/rancher/lasso v0.0.0-20240705194423-b2a060d103c1 // indirect - github.com/rancher/rke v1.6.0-rc9 // indirect - github.com/rancher/wrangler/v3 v3.0.0 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rancher/aks-operator v1.10.0 // indirect + github.com/rancher/eks-operator v1.10.0 // indirect + github.com/rancher/fleet/pkg/apis v0.11.0 // indirect + github.com/rancher/gke-operator v1.10.0 // indirect + github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 // indirect + github.com/rancher/rke v1.7.0 // indirect + github.com/rancher/wrangler/v3 v3.1.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/time v0.5.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + github.com/x448/float16 v0.8.4 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/time v0.7.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.30.2 // indirect - k8s.io/apimachinery v0.30.2 // indirect - k8s.io/apiserver v0.30.1 // indirect - k8s.io/component-base v0.30.1 // indirect - k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/api v0.31.1 // indirect + k8s.io/apimachinery v0.31.1 // indirect + k8s.io/apiserver v0.31.1 // indirect + k8s.io/component-base v0.31.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/kubernetes v1.30.1 // indirect - k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect - sigs.k8s.io/cli-utils v0.35.0 // indirect + k8s.io/kubernetes v1.31.1 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 57a4f9f6..91cdd919 100644 --- a/go.sum +++ b/go.sum @@ -3,37 +3,36 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -44,12 +43,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= -github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b h1:NGgE5ELokSf2tZ/bydyDUKrvd/jP8lrAoPNeBuMOTOk= github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b/go.mod h1:zT/uzhdQGTqlwTq7Lpbj3JoJQWfPfIJ1tE0OidAmih8= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= @@ -78,46 +77,47 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= -github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rancher/aks-operator v1.9.0-rc.9 h1:6eIjtaNz40axGgSQLijMrSImnnPLuWdCGUONpChhmYA= -github.com/rancher/aks-operator v1.9.0-rc.9/go.mod h1:JPkilTHa1Exq8VILHOmcxapgHcr9RfPVm7BqjzveMXg= -github.com/rancher/eks-operator v1.9.0-rc.11 h1:o2i91W53QyGadYxLEsdvRX2/WH/sqZ9UWEaIFAdC/jM= -github.com/rancher/eks-operator v1.9.0-rc.11/go.mod h1:W2BZXb5DJP9q34hgTey0MWOzdMU526fAdGI0iVGGhhU= -github.com/rancher/fleet/pkg/apis v0.10.0 h1:0f8OEghEDJNzvUAR2fpg2dw8EnAgfWvkhnwsYFS9G+w= -github.com/rancher/fleet/pkg/apis v0.10.0/go.mod h1:mjirthAmgpz0xo+qywUiaJDFpjnmX3xrc2E0/qmk3yc= -github.com/rancher/gke-operator v1.9.0-rc.8 h1:KqeRL9OfjsH0jRl8cw8V5Vs2j6rPVP1uGCHcaaNXRB8= -github.com/rancher/gke-operator v1.9.0-rc.8/go.mod h1:ga8AIreFbeHyH4CZVjCpEgCzo3InS+LhAVhU6jWyDNo= -github.com/rancher/lasso v0.0.0-20240705194423-b2a060d103c1 h1:vv1jDlYbd4KhGbPNxmjs8CYgEHUrQm2bMtmULfXJ6iw= -github.com/rancher/lasso v0.0.0-20240705194423-b2a060d103c1/go.mod h1:A/y3BLQkxZXYD60MNDRwAG9WGxXfvd6Z6gWR/a8wPw8= -github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 h1:AlRMRs5mHJcdiK83KKJyFVeybPMZ7dOUzC0l3k9aUa8= -github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9/go.mod h1:dyjfXBsNiroPWOdUZe7diUOUSLf6HQ/r2kEpwH/8zas= -github.com/rancher/rancher/pkg/apis v0.0.0-20240717211851-7df10c297f33 h1:kVja+SVObCR/F/bEPD7E+cxE6hS4T5nZ9oaozrxfrg8= -github.com/rancher/rancher/pkg/apis v0.0.0-20240717211851-7df10c297f33/go.mod h1:QNDRjhAOyqBDG0SHwy+6aNHFAJVUY6a1poFVHcZ6zGc= -github.com/rancher/rancher/pkg/client v0.0.0-20240717211851-7df10c297f33 h1:7Bc9qYcGUfWr/Qrzo/IeR1NcJ7EEOwiM0zA5jaAoh/M= -github.com/rancher/rancher/pkg/client v0.0.0-20240717211851-7df10c297f33/go.mod h1:A+DTKG05BZs1mOoCIB6UpiKo7j0dC6kSz3mgYju9Q20= -github.com/rancher/rke v1.6.0-rc9 h1:P8EVV4hl3cG8CHDuFUEfqFK8sC92aLoemFzmeFQOCck= -github.com/rancher/rke v1.6.0-rc9/go.mod h1:5xRbf3L8PxqJRhABjYRfaBqbpVqAnqyH3maUNQEuwvk= -github.com/rancher/wrangler/v3 v3.0.0 h1:IHHCA+vrghJDPxjtLk4fmeSCFhNe9fFzLFj3m2B0YpA= -github.com/rancher/wrangler/v3 v3.0.0/go.mod h1:Dfckuuq7MJk2JWVBDywRlZXMxEyPxHy4XqGrPEzu5Eg= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rancher/aks-operator v1.10.0 h1:9PGJUyzso2Tg9o64sYI6++mCke9ToRchvN5uZqPV+kY= +github.com/rancher/aks-operator v1.10.0/go.mod h1:n7CBXwN5mpJZT7/3PYg6cWBAVCqjayhaUiRtTCH1FMQ= +github.com/rancher/eks-operator v1.10.0 h1:a3l3nmoIf5EiYS4BQ+a9Z8+0WwZ3duek6gnrT6VZKwk= +github.com/rancher/eks-operator v1.10.0/go.mod h1:coW31jIfImAHdGsepc7yCXSuixdclQkJn3y26E9tsss= +github.com/rancher/fleet/pkg/apis v0.11.0 h1:4OjUfgGdGMQUOHDI8HWN79N9P4U5g9XiPCCbrkZVOMo= +github.com/rancher/fleet/pkg/apis v0.11.0/go.mod h1:8nvuO8x0z7ydpW0eZJEEEPHI0Bmb9T5L3igH0t+0dDk= +github.com/rancher/gke-operator v1.10.0 h1:vV9jLErnH5VRBpK/kCzem8T7/yEDqLVXIcv20Or7e7I= +github.com/rancher/gke-operator v1.10.0/go.mod h1:k3oIJMCilpaLHeHPRy90S3pfZ05vbe+b+g1ISiHQbLo= +github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 h1:V/LY8pUHZG9Kc+xEDWDOryOnCU6/Q+Lsr9QQEQnshpU= +github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813/go.mod h1:IxgTBO55lziYhTEETyVKiT8/B5Rg92qYiRmcIIYoPgI= +github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab h1:ihK6See3y/JilqZlc0CG7NXPN+ue5nY9U7xUZUA8M7I= +github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab/go.mod h1:qX/OG/4wY27xSAcSdRilUBxBumV6Ey2CWpAeaKnBQDs= +github.com/rancher/rancher/pkg/apis v0.0.0-20241119020906-df45e368c82d h1:eiUEBkdnLLR1+e0JBJiLT95xYouFFisWqDlRp/+3P2A= +github.com/rancher/rancher/pkg/apis v0.0.0-20241119020906-df45e368c82d/go.mod h1:vm4Y3LVgGn4bWOw7pNTYnqvJhrWM7l0FeGPs2s9QiTA= +github.com/rancher/rancher/pkg/client v0.0.0-20241119020906-df45e368c82d h1:nY18eCkit/7gM27W/of0hcc9FSpq0x0I0pJ5fCkC72I= +github.com/rancher/rancher/pkg/client v0.0.0-20241119020906-df45e368c82d/go.mod h1:rYJRcRhgLLnCFAlomfhBN5uZLR5qA2v0Hd9xSe+qXZA= +github.com/rancher/rke v1.7.0 h1:UFQOh/y1TXsWbbeNR3r8mDxGm9WYHyb6+F8u7rIKNL0= +github.com/rancher/rke v1.7.0/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A= +github.com/rancher/wrangler/v3 v3.1.0 h1:8ETBnQOEcZaR6WBmUSysWW7WnERBOiNTMJr4Dj3UG/s= +github.com/rancher/wrangler/v3 v3.1.0/go.mod h1:gUPHS1ANs2NyByfeERHwkGiQ1rlIa8BpTJZtNSgMlZw= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -144,8 +144,12 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -157,44 +161,46 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -204,26 +210,24 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI= -k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI= -k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg= -k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8= -k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo= -k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q= -k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc= -k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ= -k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI= -k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= -k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c= +k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= +k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/kubernetes v1.30.1 h1:XlqS6KslLEA5mQzLK2AJrhr4Z1m8oJfkhHiWJ5lue+I= -k8s.io/kubernetes v1.30.1/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0= -k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI= -k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cli-utils v0.35.0 h1:dfSJaF1W0frW74PtjwiyoB4cwdRygbHnC7qe7HF0g/Y= -sigs.k8s.io/cli-utils v0.35.0/go.mod h1:ITitykCJxP1vaj1Cew/FZEaVJ2YsTN9Q71m02jebkoE= +k8s.io/kubernetes v1.31.1 h1:1fcYJe8SAhtannpChbmnzHLwAV9Je99PrGaFtBvCxms= +k8s.io/kubernetes v1.31.1/go.mod h1:/YGPL//Fb9mdv5vukvAQ7Xon+Bqwry52bmjTdORAw+Q= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/main.go b/main.go index 9e6564bf..ce53b3f8 100644 --- a/main.go +++ b/main.go @@ -109,7 +109,6 @@ func mainErr() error { cmd.CatalogCommand(), cmd.ClusterCommand(), cmd.ContextCommand(), - cmd.GlobalDNSCommand(), cmd.InspectCommand(), cmd.KubectlCommand(), cmd.LoginCommand(),