зеркало из https://github.com/Azure/ARO-RP.git
add kubeadminUsername field
This commit is contained in:
Родитель
db74435aab
Коммит
f04481dd2f
|
@ -1 +1 @@
|
|||
48a640ffacc8268a38b50bd429c9577efad81acbbdf634804dccc2ed8babf7f8 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2019-12-31-preview/redhatopenshift.json
|
||||
c3d4ab3080f5db8b2d4eab649005182ec168a3a15823ab77ba8d4c1db254081d swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2019-12-31-preview/redhatopenshift.json
|
||||
|
|
|
@ -5,6 +5,9 @@ package v20191231preview
|
|||
|
||||
// OpenShiftClusterCredentials represents an OpenShift cluster's credentials
|
||||
type OpenShiftClusterCredentials struct {
|
||||
// The username for the kubeadmin user
|
||||
KubeadminUsername string `json:"kubeadminUsername,omitempty"`
|
||||
|
||||
// The password for the kubeadmin user
|
||||
KubeadminPassword string `json:"kubeadminPassword,omitempty"`
|
||||
}
|
||||
|
|
|
@ -14,6 +14,7 @@ import (
|
|||
// returned objects.
|
||||
func openShiftClusterCredentialsToExternal(oc *api.OpenShiftCluster) *OpenShiftClusterCredentials {
|
||||
out := &OpenShiftClusterCredentials{
|
||||
KubeadminUsername: "kubeadmin",
|
||||
KubeadminPassword: oc.Properties.KubeadminPassword,
|
||||
}
|
||||
|
||||
|
|
|
@ -234,6 +234,8 @@ func (osc *OpenShiftCluster) UnmarshalJSON(body []byte) error {
|
|||
// OpenShiftClusterCredentials openShiftClusterCredentials represents an OpenShift cluster's credentials
|
||||
type OpenShiftClusterCredentials struct {
|
||||
autorest.Response `json:"-"`
|
||||
// KubeadminUsername - The username for the kubeadmin user
|
||||
KubeadminUsername *string `json:"kubeadminUsername,omitempty"`
|
||||
// KubeadminPassword - The password for the kubeadmin user
|
||||
KubeadminPassword *string `json:"kubeadminPassword,omitempty"`
|
||||
}
|
||||
|
|
|
@ -236,16 +236,20 @@ class OpenShiftCluster(Model):
|
|||
class OpenShiftClusterCredentials(Model):
|
||||
"""OpenShiftClusterCredentials represents an OpenShift cluster's credentials.
|
||||
|
||||
:param kubeadmin_username: The username for the kubeadmin user
|
||||
:type kubeadmin_username: str
|
||||
:param kubeadmin_password: The password for the kubeadmin user
|
||||
:type kubeadmin_password: str
|
||||
"""
|
||||
|
||||
_attribute_map = {
|
||||
'kubeadmin_username': {'key': 'kubeadminUsername', 'type': 'str'},
|
||||
'kubeadmin_password': {'key': 'kubeadminPassword', 'type': 'str'},
|
||||
}
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super(OpenShiftClusterCredentials, self).__init__(**kwargs)
|
||||
self.kubeadmin_username = kwargs.get('kubeadmin_username', None)
|
||||
self.kubeadmin_password = kwargs.get('kubeadmin_password', None)
|
||||
|
||||
|
||||
|
|
|
@ -236,16 +236,20 @@ class OpenShiftCluster(Model):
|
|||
class OpenShiftClusterCredentials(Model):
|
||||
"""OpenShiftClusterCredentials represents an OpenShift cluster's credentials.
|
||||
|
||||
:param kubeadmin_username: The username for the kubeadmin user
|
||||
:type kubeadmin_username: str
|
||||
:param kubeadmin_password: The password for the kubeadmin user
|
||||
:type kubeadmin_password: str
|
||||
"""
|
||||
|
||||
_attribute_map = {
|
||||
'kubeadmin_username': {'key': 'kubeadminUsername', 'type': 'str'},
|
||||
'kubeadmin_password': {'key': 'kubeadminPassword', 'type': 'str'},
|
||||
}
|
||||
|
||||
def __init__(self, *, kubeadmin_password: str=None, **kwargs) -> None:
|
||||
def __init__(self, *, kubeadmin_username: str=None, kubeadmin_password: str=None, **kwargs) -> None:
|
||||
super(OpenShiftClusterCredentials, self).__init__(**kwargs)
|
||||
self.kubeadmin_username = kubeadmin_username
|
||||
self.kubeadmin_password = kubeadmin_password
|
||||
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
"responses": {
|
||||
"200": {
|
||||
"body": {
|
||||
"kubeadminUsername": "kubeadmin",
|
||||
"kubeadminPassword": "password"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -536,6 +536,10 @@
|
|||
"OpenShiftClusterCredentials": {
|
||||
"description": "OpenShiftClusterCredentials represents an OpenShift cluster's credentials",
|
||||
"properties": {
|
||||
"kubeadminUsername": {
|
||||
"description": "The username for the kubeadmin user",
|
||||
"type": "string"
|
||||
},
|
||||
"kubeadminPassword": {
|
||||
"description": "The password for the kubeadmin user",
|
||||
"type": "string"
|
||||
|
|
Загрузка…
Ссылка в новой задаче