Update some manifests

This commit is contained in:
Jian Qiu
2020-06-04 13:31:34 +08:00
parent 399a6b9a73
commit fd589e99f2
8 changed files with 4 additions and 511 deletions

View File

@@ -1,126 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: klusterlets.operator.open-cluster-management.io
spec:
group: operator.open-cluster-management.io
names:
kind: Klusterlet
listKind: KlusterletList
plural: klusterlets
singular: klusterlet
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Klusterlet represents controllers on the managed cluster. When
configured, the Klusterlet requires a secret named of bootstrap-hub-kubeconfig
in the same namespace to allow API requests to the hub for the registration
protocol.
type: object
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec represents the desired deployment configuration of klusterlet
agent.
type: object
properties:
clusterName:
description: ClusterName is the name of the spoke cluster to be created
on hub. The spoke agent generates a random name if it is not set,
or discovers the appropriate cluster name on openshift.
type: string
externalServerURLs:
description: ExternalServerURLs represents the a list of apiserver urls
and ca bundles that is accessible externally If it is set empty, spoke
cluster has no externally accessible url that hub cluster can visit.
type: array
items:
description: ServerURL represents the apiserver url and ca bundle
that is accessible externally
type: object
properties:
caBundle:
description: CABundle is the ca bundle to connect to apiserver
of the spoke cluster. System certs are used if it is not set.
type: string
format: byte
url:
description: URL is the url of apiserver endpoint of the spoke
cluster.
type: string
namespace:
description: Namespace is the namespace to deploy the agent. The namespace
must have a prefix of "open-cluster-management-", and if it is not
set, the namespace of "open-cluster-management-spoke" is used to deploy
agent.
type: string
registrationImagePullSpec:
description: RegistrationImagePullSpec represents the desired image
configuration of registration agent.
type: string
workImagePullSpec:
description: WorkImagePullSpec represents the desired image configuration
of work agent.
type: string
status:
description: Status represents the current status of klusterlet agent.
type: object
properties:
conditions:
description: 'Conditions contain the different condition statuses for
this spokecore. Valid condition types are: Applied: components in
spoke is applied. Available: components in spoke are available and
ready to serve. Progressing: components in spoke are in a transitioning
state. Degraded: components in spoke do not match the desired configuration
and only provide degraded service.'
type: array
items:
description: StatusCondition contains condition information.
type: object
properties:
lastTransitionTime:
description: LastTransitionTime is the last time the condition
changed from one status to another.
type: string
format: date-time
message:
description: Message is a human-readable message indicating details
about the last status change.
type: string
reason:
description: Reason is a (brief) reason for the condition's last
status change.
type: string
status:
description: Status is the status of the condition. One of True,
False, Unknown.
type: string
type:
description: Type is the type of the cluster condition.
type: string
version: v1
versions:
- name: v1
served: true
storage: true
preserveUnknownFields: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,126 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: klusterlets.operator.open-cluster-management.io
spec:
group: operator.open-cluster-management.io
names:
kind: Klusterlet
listKind: KlusterletList
plural: klusterlets
singular: klusterlet
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Klusterlet represents controllers on the managed cluster. When
configured, the Klusterlet requires a secret named of bootstrap-hub-kubeconfig
in the same namespace to allow API requests to the hub for the registration
protocol.
type: object
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec represents the desired deployment configuration of klusterlet
agent.
type: object
properties:
clusterName:
description: ClusterName is the name of the spoke cluster to be created
on hub. The spoke agent generates a random name if it is not set,
or discovers the appropriate cluster name on openshift.
type: string
externalServerURLs:
description: ExternalServerURLs represents the a list of apiserver urls
and ca bundles that is accessible externally If it is set empty, spoke
cluster has no externally accessible url that hub cluster can visit.
type: array
items:
description: ServerURL represents the apiserver url and ca bundle
that is accessible externally
type: object
properties:
caBundle:
description: CABundle is the ca bundle to connect to apiserver
of the spoke cluster. System certs are used if it is not set.
type: string
format: byte
url:
description: URL is the url of apiserver endpoint of the spoke
cluster.
type: string
namespace:
description: Namespace is the namespace to deploy the agent. The namespace
must have a prefix of "open-cluster-management-", and if it is not
set, the namespace of "open-cluster-management-spoke" is used to deploy
agent.
type: string
registrationImagePullSpec:
description: RegistrationImagePullSpec represents the desired image
configuration of registration agent.
type: string
workImagePullSpec:
description: WorkImagePullSpec represents the desired image configuration
of work agent.
type: string
status:
description: Status represents the current status of klusterlet agent.
type: object
properties:
conditions:
description: 'Conditions contain the different condition statuses for
this spokecore. Valid condition types are: Applied: components in
spoke is applied. Available: components in spoke are available and
ready to serve. Progressing: components in spoke are in a transitioning
state. Degraded: components in spoke do not match the desired configuration
and only provide degraded service.'
type: array
items:
description: StatusCondition contains condition information.
type: object
properties:
lastTransitionTime:
description: LastTransitionTime is the last time the condition
changed from one status to another.
type: string
format: date-time
message:
description: Message is a human-readable message indicating details
about the last status change.
type: string
reason:
description: Reason is a (brief) reason for the condition's last
status change.
type: string
status:
description: Status is the status of the condition. One of True,
False, Unknown.
type: string
type:
description: Type is the type of the cluster condition.
type: string
version: v1
versions:
- name: v1
served: true
storage: true
preserveUnknownFields: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,126 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: klusterlets.operator.open-cluster-management.io
spec:
group: operator.open-cluster-management.io
names:
kind: Klusterlet
listKind: KlusterletList
plural: klusterlets
singular: klusterlet
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Klusterlet represents controllers on the managed cluster. When
configured, the Klusterlet requires a secret named of bootstrap-hub-kubeconfig
in the same namespace to allow API requests to the hub for the registration
protocol.
type: object
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec represents the desired deployment configuration of klusterlet
agent.
type: object
properties:
clusterName:
description: ClusterName is the name of the spoke cluster to be created
on hub. The spoke agent generates a random name if it is not set,
or discovers the appropriate cluster name on openshift.
type: string
externalServerURLs:
description: ExternalServerURLs represents the a list of apiserver urls
and ca bundles that is accessible externally If it is set empty, spoke
cluster has no externally accessible url that hub cluster can visit.
type: array
items:
description: ServerURL represents the apiserver url and ca bundle
that is accessible externally
type: object
properties:
caBundle:
description: CABundle is the ca bundle to connect to apiserver
of the spoke cluster. System certs are used if it is not set.
type: string
format: byte
url:
description: URL is the url of apiserver endpoint of the spoke
cluster.
type: string
namespace:
description: Namespace is the namespace to deploy the agent. The namespace
must have a prefix of "open-cluster-management-", and if it is not
set, the namespace of "open-cluster-management-spoke" is used to deploy
agent.
type: string
registrationImagePullSpec:
description: RegistrationImagePullSpec represents the desired image
configuration of registration agent.
type: string
workImagePullSpec:
description: WorkImagePullSpec represents the desired image configuration
of work agent.
type: string
status:
description: Status represents the current status of klusterlet agent.
type: object
properties:
conditions:
description: 'Conditions contain the different condition statuses for
this spokecore. Valid condition types are: Applied: components in
spoke is applied. Available: components in spoke are available and
ready to serve. Progressing: components in spoke are in a transitioning
state. Degraded: components in spoke do not match the desired configuration
and only provide degraded service.'
type: array
items:
description: StatusCondition contains condition information.
type: object
properties:
lastTransitionTime:
description: LastTransitionTime is the last time the condition
changed from one status to another.
type: string
format: date-time
message:
description: Message is a human-readable message indicating details
about the last status change.
type: string
reason:
description: Reason is a (brief) reason for the condition's last
status change.
type: string
status:
description: Status is the status of the condition. One of True,
False, Unknown.
type: string
type:
description: Type is the type of the cluster condition.
type: string
version: v1
versions:
- name: v1
served: true
storage: true
preserveUnknownFields: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,126 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: klusterlets.operator.open-cluster-management.io
spec:
group: operator.open-cluster-management.io
names:
kind: Klusterlet
listKind: KlusterletList
plural: klusterlets
singular: klusterlet
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Klusterlet represents controllers on the managed cluster. When
configured, the Klusterlet requires a secret named of bootstrap-hub-kubeconfig
in the same namespace to allow API requests to the hub for the registration
protocol.
type: object
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec represents the desired deployment configuration of klusterlet
agent.
type: object
properties:
clusterName:
description: ClusterName is the name of the spoke cluster to be created
on hub. The spoke agent generates a random name if it is not set,
or discovers the appropriate cluster name on openshift.
type: string
externalServerURLs:
description: ExternalServerURLs represents the a list of apiserver urls
and ca bundles that is accessible externally If it is set empty, spoke
cluster has no externally accessible url that hub cluster can visit.
type: array
items:
description: ServerURL represents the apiserver url and ca bundle
that is accessible externally
type: object
properties:
caBundle:
description: CABundle is the ca bundle to connect to apiserver
of the spoke cluster. System certs are used if it is not set.
type: string
format: byte
url:
description: URL is the url of apiserver endpoint of the spoke
cluster.
type: string
namespace:
description: Namespace is the namespace to deploy the agent. The namespace
must have a prefix of "open-cluster-management-", and if it is not
set, the namespace of "open-cluster-management-spoke" is used to deploy
agent.
type: string
registrationImagePullSpec:
description: RegistrationImagePullSpec represents the desired image
configuration of registration agent.
type: string
workImagePullSpec:
description: WorkImagePullSpec represents the desired image configuration
of work agent.
type: string
status:
description: Status represents the current status of klusterlet agent.
type: object
properties:
conditions:
description: 'Conditions contain the different condition statuses for
this spokecore. Valid condition types are: Applied: components in
spoke is applied. Available: components in spoke are available and
ready to serve. Progressing: components in spoke are in a transitioning
state. Degraded: components in spoke do not match the desired configuration
and only provide degraded service.'
type: array
items:
description: StatusCondition contains condition information.
type: object
properties:
lastTransitionTime:
description: LastTransitionTime is the last time the condition
changed from one status to another.
type: string
format: date-time
message:
description: Message is a human-readable message indicating details
about the last status change.
type: string
reason:
description: Reason is a (brief) reason for the condition's last
status change.
type: string
status:
description: Status is the status of the condition. One of True,
False, Unknown.
type: string
type:
description: Type is the type of the cluster condition.
type: string
version: v1
versions:
- name: v1
served: true
storage: true
preserveUnknownFields: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -33,9 +33,6 @@ spec:
- kind: Klusterlet
name: klusterlets.operator.open-cluster-management.io
version: v1
- kind: Klusterlet
name: klusterlets.operator.open-cluster-management.io
version: v1
displayName: Klusterlet
icon:
- base64data: ""
@@ -157,7 +154,7 @@ spec:
containers:
- args:
- /nucleus
- spoke
- klusterlet
image: quay.io/open-cluster-management/nucleus:latest
imagePullPolicy: IfNotPresent
livenessProbe:

View File

@@ -22,7 +22,7 @@ spec:
imagePullPolicy: IfNotPresent
args:
- "/nucleus"
- "spoke"
- "klusterlet"
livenessProbe:
httpGet:
path: /healthz

View File

@@ -17,7 +17,7 @@ spec:
spec:
serviceAccountName: {{ .KlusterletName }}-work-sa
containers:
- name: ç
- name: klusterlet-manifestwork-agent
image: {{ .WorkImage }}
imagePullPolicy: IfNotPresent
args:

View File

@@ -402,7 +402,7 @@ spec:
spec:
serviceAccountName: {{ .KlusterletName }}-work-sa
containers:
- name: ç
- name: klusterlet-manifestwork-agent
image: {{ .WorkImage }}
imagePullPolicy: IfNotPresent
args: