Merge pull request #226 from vardhaman22/update-rancher-pkg-apis

update rancher pkg apis

clients/rancher/generated/management/v3/zz_generated_key_cloak_oidcconfig.go

@@ -3,6 +3,7 @@ package client
 const (
 	KeyCloakOIDCConfigType                     = "keyCloakOIDCConfig"
 	KeyCloakOIDCConfigFieldAccessMode          = "accessMode"
+	KeyCloakOIDCConfigFieldAcrValue            = "acrValue"
 	KeyCloakOIDCConfigFieldAllowedPrincipalIDs = "allowedPrincipalIds"
 	KeyCloakOIDCConfigFieldAnnotations         = "annotations"
 	KeyCloakOIDCConfigFieldAuthEndpoint        = "authEndpoint"
@@ -32,6 +33,7 @@ const (
 
 type KeyCloakOIDCConfig struct {
 	AccessMode          string            `json:"accessMode,omitempty" yaml:"accessMode,omitempty"`
+	AcrValue            string            `json:"acrValue,omitempty" yaml:"acrValue,omitempty"`
 	AllowedPrincipalIDs []string          `json:"allowedPrincipalIds,omitempty" yaml:"allowedPrincipalIds,omitempty"`
 	Annotations         map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
 	AuthEndpoint        string            `json:"authEndpoint,omitempty" yaml:"authEndpoint,omitempty"`

clients/rancher/generated/management/v3/zz_generated_oidc_config.go

@@ -3,6 +3,7 @@ package client
 const (
 	OIDCConfigType                     = "oidcConfig"
 	OIDCConfigFieldAccessMode          = "accessMode"
+	OIDCConfigFieldAcrValue            = "acrValue"
 	OIDCConfigFieldAllowedPrincipalIDs = "allowedPrincipalIds"
 	OIDCConfigFieldAnnotations         = "annotations"
 	OIDCConfigFieldAuthEndpoint        = "authEndpoint"
@@ -32,6 +33,7 @@ const (
 
 type OIDCConfig struct {
 	AccessMode          string            `json:"accessMode,omitempty" yaml:"accessMode,omitempty"`
+	AcrValue            string            `json:"acrValue,omitempty" yaml:"acrValue,omitempty"`
 	AllowedPrincipalIDs []string          `json:"allowedPrincipalIds,omitempty" yaml:"allowedPrincipalIds,omitempty"`
 	Annotations         map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
 	AuthEndpoint        string            `json:"authEndpoint,omitempty" yaml:"authEndpoint,omitempty"`

clients/rancher/generated/management/v3/zz_generated_user_attribute.go

@@ -5,9 +5,12 @@ const (
 	UserAttributeFieldAnnotations     = "annotations"
 	UserAttributeFieldCreated         = "created"
 	UserAttributeFieldCreatorID       = "creatorId"
+	UserAttributeFieldDeleteAfter     = "deleteAfter"
+	UserAttributeFieldDisableAfter    = "disableAfter"
 	UserAttributeFieldExtraByProvider = "extraByProvider"
 	UserAttributeFieldGroupPrincipals = "groupPrincipals"
 	UserAttributeFieldLabels          = "labels"
+	UserAttributeFieldLastLogin       = "lastLogin"
 	UserAttributeFieldLastRefresh     = "lastRefresh"
 	UserAttributeFieldName            = "name"
 	UserAttributeFieldNeedsRefresh    = "needsRefresh"
@@ -21,9 +24,12 @@ type UserAttribute struct {
 	Annotations     map[string]string              `json:"annotations,omitempty" yaml:"annotations,omitempty"`
 	Created         string                         `json:"created,omitempty" yaml:"created,omitempty"`
 	CreatorID       string                         `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
+	DeleteAfter     *Duration                      `json:"deleteAfter,omitempty" yaml:"deleteAfter,omitempty"`
+	DisableAfter    *Duration                      `json:"disableAfter,omitempty" yaml:"disableAfter,omitempty"`
 	ExtraByProvider map[string]map[string][]string `json:"extraByProvider,omitempty" yaml:"extraByProvider,omitempty"`
 	GroupPrincipals map[string]Principal           `json:"groupPrincipals,omitempty" yaml:"groupPrincipals,omitempty"`
 	Labels          map[string]string              `json:"labels,omitempty" yaml:"labels,omitempty"`
+	LastLogin       string                         `json:"lastLogin,omitempty" yaml:"lastLogin,omitempty"`
 	LastRefresh     string                         `json:"lastRefresh,omitempty" yaml:"lastRefresh,omitempty"`
 	Name            string                         `json:"name,omitempty" yaml:"name,omitempty"`
 	NeedsRefresh    bool                           `json:"needsRefresh,omitempty" yaml:"needsRefresh,omitempty"`

go.mod

@@ -4,8 +4,6 @@ go 1.22.0
 
 toolchain go1.22.3
 
-replace github.com/rancher/rancher/pkg/apis => github.com/vardhaman22/rancher/pkg/apis v0.0.0-20240619051441-656b5afd821d
-
 replace (
 	k8s.io/api => k8s.io/api v0.30.1
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.1
@@ -32,8 +30,8 @@ require (
 	github.com/rancher/fleet/pkg/apis v0.10.0-rc.16
 	github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7
 	github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1
-	github.com/rancher/rancher/pkg/apis v0.0.0-20240613110601-c21147a009c6
-	github.com/rancher/rke v1.6.0-rc7
+	github.com/rancher/rancher/pkg/apis v0.0.0-20240701102734-a84c3a2f36c1
+	github.com/rancher/rke v1.6.0-rc8
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007
 	github.com/rancher/wrangler v1.1.2
 	github.com/rancher/wrangler/v3 v3.0.0-rc2
@@ -137,9 +135,9 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/rancher/aks-operator v1.9.0-rc.8 // indirect
-	github.com/rancher/eks-operator v1.9.0-rc.8 // indirect
-	github.com/rancher/gke-operator v1.9.0-rc.7 // indirect
+	github.com/rancher/aks-operator v1.9.0-rc.9 // indirect
+	github.com/rancher/eks-operator v1.9.0-rc.9 // indirect
+	github.com/rancher/gke-operator v1.9.0-rc.8 // indirect
 	github.com/rancher/wrangler/v2 v2.2.0-rc6 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect

go.sum

@@ -1731,22 +1731,24 @@ github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPH
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rancher/aks-operator v1.9.0-rc.8 h1:xvEJMPbQ8tYBgxJJZa48sJK2e2BK6L8J67KIWiDLxuQ=
-github.com/rancher/aks-operator v1.9.0-rc.8/go.mod h1:e7nMwITZ0D+j21gb1dg3HMGPm8N3jBkxjBoPGhEnt9c=
+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/apiserver v0.0.0-20240604183424-8c448886365e h1:u/zH1L+NZh+Q0cZ2S4raOn/EMG9GYiBwZYzu3FfXVTg=
 github.com/rancher/apiserver v0.0.0-20240604183424-8c448886365e/go.mod h1:4arf2ls2ELpOCD+YUgNlWp+G1n0duubUKCtT7dulsNc=
-github.com/rancher/eks-operator v1.9.0-rc.8 h1:BMCi/1n5VHVrhEwra4+hppYInAYzp3vqrVRBqCfBcgo=
-github.com/rancher/eks-operator v1.9.0-rc.8/go.mod h1:My3yFbAlPjrArFMfte+fg9WgGt0+euC+1Wm15I9/cAo=
+github.com/rancher/eks-operator v1.9.0-rc.9 h1:dgKDUdBfctCTH+loKO2In8tBnbKR0pvJ6BbCEW+Unf0=
+github.com/rancher/eks-operator v1.9.0-rc.9/go.mod h1:CaQyxLNMPkvznhgzlUG3+r5Ih02O0SQD0hE0ocMWqm4=
 github.com/rancher/fleet/pkg/apis v0.10.0-rc.16 h1:M35Fk9q3ttZjHCOCCmaN8i4teqSso8tetIzxNtm8lyU=
 github.com/rancher/fleet/pkg/apis v0.10.0-rc.16/go.mod h1:AO27VlVcMra5roVMpe76QWo4YOr1V4dnfu4e2a2C9bw=
-github.com/rancher/gke-operator v1.9.0-rc.7 h1:jM1kO4c/ajN8wDfc7MF6M2l21XqOVxgiZgu1ams8BvE=
-github.com/rancher/gke-operator v1.9.0-rc.7/go.mod h1:ga8AIreFbeHyH4CZVjCpEgCzo3InS+LhAVhU6jWyDNo=
+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-20240603075835-701e919d08b7 h1:E5AeOkylBXf4APhnHgDvePdtpxOfIjhKnxfjm4sDIEk=
 github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7/go.mod h1:v0FJLrmL4m6zdWfIB0/qo7qN5QIjVMFyvFGaw8uyWsA=
 github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1 h1:7g0yOiUGfT4zK4N9H0PSijnS/e2YrObi4Gj19JgE1L8=
 github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1/go.mod h1:sGnN5ayvAHLfInOFZ4N1fzZw1IMy3i+9PZA7IxlPsRg=
-github.com/rancher/rke v1.6.0-rc7 h1:AfKugPEJtZrjgbcr5zGTwTuv18GJAUUMOMKaXUbT8TU=
-github.com/rancher/rke v1.6.0-rc7/go.mod h1:5xRbf3L8PxqJRhABjYRfaBqbpVqAnqyH3maUNQEuwvk=
+github.com/rancher/rancher/pkg/apis v0.0.0-20240701102734-a84c3a2f36c1 h1:X4paCxzgF9nIifFZLRN7sodm5z+5i5LP1O9h+kqQPVc=
+github.com/rancher/rancher/pkg/apis v0.0.0-20240701102734-a84c3a2f36c1/go.mod h1:rMykLL3vGc1X5E4wLqwfu9kbxkzIKzG2gN5JuHDdeZM=
+github.com/rancher/rke v1.6.0-rc8 h1:KBqmmHSTLAksyw6NVS8eezd+uqb1Q8CQiJlE1IuSzjw=
+github.com/rancher/rke v1.6.0-rc8/go.mod h1:5xRbf3L8PxqJRhABjYRfaBqbpVqAnqyH3maUNQEuwvk=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007 h1:ru+mqGnxMmKeU0Q3XIDxkARvInDIqT1hH2amTcsjxI4=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007/go.mod h1:Ja346o44aTPWADc/5Jm93+KgctT6KtftuOosgz0F2AM=
 github.com/rancher/wrangler v0.6.1/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4=
@@ -1866,8 +1868,6 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/vardhaman22/rancher/pkg/apis v0.0.0-20240619051441-656b5afd821d h1:th9BS4JXuFWyzpKCHdRNZcr4inDCk6i4DObyowXr0ms=
-github.com/vardhaman22/rancher/pkg/apis v0.0.0-20240619051441-656b5afd821d/go.mod h1:uJiRwTVNvPWOgCv22BkKqORlhPvcL+AyHj6TfsrxFKY=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=