From fd589e99f28dd2a63b92ef5068e932cbfba62a23 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Thu, 4 Jun 2020 13:31:34 +0800 Subject: [PATCH] Update some manifests --- ...rd.yaml~Adopt new API updates for operator | 126 ------------------ ...l~eeb95e939f074ff44e80dff94ef9973d34d8d28a | 126 ------------------ ...rd.yaml~Adopt new API updates for operator | 126 ------------------ ...l~eeb95e939f074ff44e80dff94ef9973d34d8d28a | 126 ------------------ .../klusterlet.clusterserviceversion.yaml | 5 +- deploy/klusterlet/operator.yaml | 2 +- .../klusterlet-work-deployment.yaml | 2 +- pkg/operators/klusterlet/bindata/bindata.go | 2 +- 8 files changed, 4 insertions(+), 511 deletions(-) delete mode 100644 deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator delete mode 100644 deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a delete mode 100644 deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator delete mode 100644 deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a diff --git a/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator b/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator deleted file mode 100644 index 7a2cc5cde..000000000 --- a/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator +++ /dev/null @@ -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: [] diff --git a/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a b/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a deleted file mode 100644 index 7a2cc5cde..000000000 --- a/deploy/klusterlet/crds/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a +++ /dev/null @@ -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: [] diff --git a/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator b/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator deleted file mode 100644 index 7a2cc5cde..000000000 --- a/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~Adopt new API updates for operator +++ /dev/null @@ -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: [] diff --git a/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a b/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a deleted file mode 100644 index 7a2cc5cde..000000000 --- a/deploy/klusterlet/olm-catalog/klusterlet/manifests/0000_00_operator.open-cluster-management.io_klusterlets.crd.yaml~eeb95e939f074ff44e80dff94ef9973d34d8d28a +++ /dev/null @@ -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: [] diff --git a/deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml b/deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml index b69cb963d..0f396629b 100644 --- a/deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml +++ b/deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml @@ -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: diff --git a/deploy/klusterlet/operator.yaml b/deploy/klusterlet/operator.yaml index e86ea5018..3f80ef4b8 100644 --- a/deploy/klusterlet/operator.yaml +++ b/deploy/klusterlet/operator.yaml @@ -22,7 +22,7 @@ spec: imagePullPolicy: IfNotPresent args: - "/nucleus" - - "spoke" + - "klusterlet" livenessProbe: httpGet: path: /healthz diff --git a/manifests/klusterlet/klusterlet-work-deployment.yaml b/manifests/klusterlet/klusterlet-work-deployment.yaml index 32d12173c..aa096689d 100644 --- a/manifests/klusterlet/klusterlet-work-deployment.yaml +++ b/manifests/klusterlet/klusterlet-work-deployment.yaml @@ -17,7 +17,7 @@ spec: spec: serviceAccountName: {{ .KlusterletName }}-work-sa containers: - - name: ç + - name: klusterlet-manifestwork-agent image: {{ .WorkImage }} imagePullPolicy: IfNotPresent args: diff --git a/pkg/operators/klusterlet/bindata/bindata.go b/pkg/operators/klusterlet/bindata/bindata.go index d143846ae..762810751 100644 --- a/pkg/operators/klusterlet/bindata/bindata.go +++ b/pkg/operators/klusterlet/bindata/bindata.go @@ -402,7 +402,7 @@ spec: spec: serviceAccountName: {{ .KlusterletName }}-work-sa containers: - - name: ç + - name: klusterlet-manifestwork-agent image: {{ .WorkImage }} imagePullPolicy: IfNotPresent args: