diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
index f326a92ac4..b54ad1a51c 100644
--- a/pkg/apis/kops/componentconfig.go
+++ b/pkg/apis/kops/componentconfig.go
@@ -384,6 +384,12 @@ type KubeAPIServerConfig struct {
 	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 
 	StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
+
+	OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
+	OIDCGroupsClaim   *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
+	OIDCIssuerURL     *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
+	OIDCClientID      *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
+	OIDCCAFile        *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
 }
 
 type KubeControllerManagerConfig struct {
diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go
index de17939800..924a85da4f 100644
--- a/pkg/apis/kops/v1alpha1/componentconfig.go
+++ b/pkg/apis/kops/v1alpha1/componentconfig.go
@@ -381,6 +381,12 @@ type KubeAPIServerConfig struct {
 	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 
 	StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
+
+   OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
+   OIDCGroupsClaim   *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
+   OIDCIssuerURL     *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
+   OIDCClientID      *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
+   OIDCCAFile        *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
 }
 
 type KubeControllerManagerConfig struct {
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
index 97e6058c99..e0f9076503 100644
--- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
+++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
@@ -918,6 +918,12 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
 	out.AnonymousAuth = in.AnonymousAuth
 	out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
 	out.StorageBackend = in.StorageBackend
+	out.OIDCUsernameClaim = in.OIDCUsernameClaim
+	out.OIDCGroupsClaim = in.OIDCGroupsClaim
+	out.OIDCIssuerURL = in.OIDCIssuerURL
+	out.OIDCClientID = in.OIDCClientID
+	out.OIDCCAFile = in.OIDCCAFile
+
 	return nil
 }
 
@@ -948,6 +954,11 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
 	out.AnonymousAuth = in.AnonymousAuth
 	out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
 	out.StorageBackend = in.StorageBackend
+	out.OIDCUsernameClaim = in.OIDCUsernameClaim
+	out.OIDCGroupsClaim = in.OIDCGroupsClaim
+	out.OIDCIssuerURL = in.OIDCIssuerURL
+	out.OIDCClientID = in.OIDCClientID
+	out.OIDCCAFile = in.OIDCCAFile
 	return nil
 }
 
diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
index ec53823bb7..151b25f779 100644
--- a/pkg/apis/kops/v1alpha2/componentconfig.go
+++ b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -139,6 +139,12 @@ type KubeAPIServerConfig struct {
 	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 
 	StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
+
+   OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
+   OIDCGroupsClaim   *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
+   OIDCIssuerURL     *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
+   OIDCClientID      *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
+   OIDCCAFile        *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
 }
 
 type KubeControllerManagerConfig struct {