github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 10:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump to 0.12.0 (#356)

Browse Source 
Signed-off-by: Zhiwei Yin <zyin@redhat.com>
This commit is contained in:
Zhiwei Yin
2023-05-25 10:41:55 +08:00
committed by GitHub
parent d9c40bce99
commit a9b50c6def
11 changed files with 1532 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -18,7 +18,7 @@ IMAGE_TAG?=latest
IMAGE_NAME?=$(IMAGE_REGISTRY)/registration-operator:$(IMAGE_TAG)
# CSV_VERSION is used to generate new CSV manifests
CSV_VERSION?=0.11.0
CSV_VERSION?=0.12.0
# WORK_IMAGE can be set in the env to override calculated value
WORK_TAG?=latest

22
deploy/cluster-manager/config/manifests/bases/cluster-manager.clusterserviceversion.yaml
View File

@@ -7,7 +7,7 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/open-cluster-management/registration-operator:latest
createdAt: "2023-02-17T20:00:31Z"
createdAt: "2023-05-24T20:00:31Z"
description: Manages the installation and upgrade of the ClusterManager.
repository: https://github.com/open-cluster-management-io/registration-operator
support: Red Hat, Inc.
@@ -34,18 +34,10 @@ spec:
```
$ kubectl get pods -n open-cluster-management-hub
NAME READY STATUS RESTARTS AGE
cluster-manager-placement-controller-d76cffb7c-fvzjh 1/1 Running 0 22h
cluster-manager-placement-controller-d76cffb7c-qnpjl 1/1 Running 0 22h
cluster-manager-placement-controller-d76cffb7c-tt4h6 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-btmpp 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-gt6fv 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-pl46k 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-crr69 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-s2dkb 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-s7lp5 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-ddz2d 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-kd92j 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-vdbkl 1/1 Running 0 22h
cluster-manager-placement-controller-dbcfd4975-26jpw 1/1 Running 0 61m
cluster-manager-registration-controller-7949d97899-wwtg4 1/1 Running 0 61m
cluster-manager-registration-webhook-7f675bc4bb-v4rhj 1/1 Running 0 61m
cluster-manager-work-webhook-6c9d65fb95-jh97b 1/1 Running 0 61m
```
There is a ManagedCluster created in the Hub cluster when the managed cluster is registered to the Hub cluster.
@@ -88,8 +80,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: cluster-manager.v0.10.0
replaces: cluster-manager.v0.11.0
selector:
matchLabels:
app: cluster-manager
version: 0.11.0
version: 0.12.0

586
deploy/cluster-manager/olm-catalog/cluster-manager/0.11.0/cluster-manager.clusterserviceversion.yaml Normal file
View File

File diff suppressed because one or more lines are too long

315
deploy/cluster-manager/olm-catalog/cluster-manager/0.11.0/operator.open-cluster-management.io_clustermanagers.yaml Normal file
View File

@@ -0,0 +1,315 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: clustermanagers.operator.open-cluster-management.io
spec:
group: operator.open-cluster-management.io
names:
kind: ClusterManager
listKind: ClusterManagerList
plural: clustermanagers
singular: clustermanager
scope: Cluster
versions:
- name: v1
schema:
openAPIV3Schema:
description: ClusterManager configures the controllers on the hub that govern registration and work distribution for attached Klusterlets. In Default mode, ClusterManager will only be deployed in open-cluster-management-hub namespace. In Hosted mode, ClusterManager will be deployed in the namespace with the same name as cluster manager.
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:
default:
deployOption:
mode: Default
description: Spec represents a desired deployment configuration of controllers that govern registration and work distribution for attached Klusterlets.
properties:
addOnManagerConfiguration:
description: AddOnManagerConfiguration contains the configuration of addon manager
properties:
featureGates:
description: 'FeatureGates represents the list of feature gates for addon manager If it is set empty, default feature gates will be used. If it is set, featuregate/Foo is an example of one item in FeatureGates: 1. If featuregate/Foo does not exist, registration-operator will discard it 2. If featuregate/Foo exists and is false by default. It is now possible to set featuregate/Foo=[false|true] 3. If featuregate/Foo exists and is true by default. If a cluster-admin upgrading from 1 to 2 wants to continue having featuregate/Foo=false, he can set featuregate/Foo=false before upgrading. Let''s say the cluster-admin wants featuregate/Foo=false.'
items:
properties:
feature:
description: Feature is the key of feature gate. e.g. featuregate/Foo.
type: string
mode:
default: Disable
description: Mode is either Enable, Disable, "" where "" is Disable by default. In Enable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=true". In Disable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=false".
enum:
- Enable
- Disable
type: string
required:
- feature
type: object
type: array
type: object
addOnManagerImagePullSpec:
default: quay.io/open-cluster-management/addon-manager
description: AddOnManagerImagePullSpec represents the desired image configuration of addon manager controller/webhook installed on hub.
type: string
deployOption:
default:
mode: Default
description: DeployOption contains the options of deploying a cluster-manager Default mode is used if DeployOption is not set.
properties:
hosted:
description: Hosted includes configurations we needs for clustermanager in the Hosted mode.
properties:
registrationWebhookConfiguration:
description: RegistrationWebhookConfiguration represents the customized webhook-server configuration of registration.
properties:
address:
description: Address represents the address of a webhook-server. It could be in IP format or fqdn format. The Address must be reachable by apiserver of the hub cluster.
pattern: ^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$
type: string
port:
default: 443
description: Port represents the port of a webhook-server. The default value of Port is 443.
format: int32
maximum: 65535
type: integer
required:
- address
type: object
workWebhookConfiguration:
description: WorkWebhookConfiguration represents the customized webhook-server configuration of work.
properties:
address:
description: Address represents the address of a webhook-server. It could be in IP format or fqdn format. The Address must be reachable by apiserver of the hub cluster.
pattern: ^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$
type: string
port:
default: 443
description: Port represents the port of a webhook-server. The default value of Port is 443.
format: int32
maximum: 65535
type: integer
required:
- address
type: object
type: object
mode:
default: Default
description: 'Mode can be Default or Hosted. In Default mode, the Hub is installed as a whole and all parts of Hub are deployed in the same cluster. In Hosted mode, only crd and configurations are installed on one cluster(defined as hub-cluster). Controllers run in another cluster (defined as management-cluster) and connect to the hub with the kubeconfig in secret of "external-hub-kubeconfig"(a kubeconfig of hub-cluster with cluster-admin permission). Note: Do not modify the Mode field once it''s applied.'
enum:
- Default
- Hosted
type: string
required:
- mode
type: object
nodePlacement:
description: NodePlacement enables explicit control over the scheduling of the deployed pods.
properties:
nodeSelector:
additionalProperties:
type: string
description: NodeSelector defines which Nodes the Pods are scheduled on. The default is an empty list.
type: object
tolerations:
description: Tolerations is attached by pods to tolerate any taint that matches the triple <key,value,effect> using the matching operator <operator>. The default is an empty list.
items:
description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
type: string
key:
description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
type: string
operator:
description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
type: string
type: object
type: array
type: object
placementImagePullSpec:
default: quay.io/open-cluster-management/placement
description: PlacementImagePullSpec represents the desired image configuration of placement controller/webhook installed on hub.
type: string
registrationConfiguration:
description: RegistrationConfiguration contains the configuration of registration
properties:
autoApproveUsers:
description: AutoApproveUser represents a list of users that can auto approve CSR and accept client. If the credential of the bootstrap-hub-kubeconfig matches to the users, the cluster created by the bootstrap-hub-kubeconfig will be auto-registered into the hub cluster. This takes effect only when ManagedClusterAutoApproval feature gate is enabled.
items:
type: string
type: array
featureGates:
description: 'FeatureGates represents the list of feature gates for registration If it is set empty, default feature gates will be used. If it is set, featuregate/Foo is an example of one item in FeatureGates: 1. If featuregate/Foo does not exist, registration-operator will discard it 2. If featuregate/Foo exists and is false by default. It is now possible to set featuregate/Foo=[false|true] 3. If featuregate/Foo exists and is true by default. If a cluster-admin upgrading from 1 to 2 wants to continue having featuregate/Foo=false, he can set featuregate/Foo=false before upgrading. Let''s say the cluster-admin wants featuregate/Foo=false.'
items:
properties:
feature:
description: Feature is the key of feature gate. e.g. featuregate/Foo.
type: string
mode:
default: Disable
description: Mode is either Enable, Disable, "" where "" is Disable by default. In Enable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=true". In Disable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=false".
enum:
- Enable
- Disable
type: string
required:
- feature
type: object
type: array
type: object
registrationImagePullSpec:
default: quay.io/open-cluster-management/registration
description: RegistrationImagePullSpec represents the desired image of registration controller/webhook installed on hub.
type: string
workConfiguration:
description: WorkConfiguration contains the configuration of work
properties:
featureGates:
description: 'FeatureGates represents the list of feature gates for work If it is set empty, default feature gates will be used. If it is set, featuregate/Foo is an example of one item in FeatureGates: 1. If featuregate/Foo does not exist, registration-operator will discard it 2. If featuregate/Foo exists and is false by default. It is now possible to set featuregate/Foo=[false|true] 3. If featuregate/Foo exists and is true by default. If a cluster-admin upgrading from 1 to 2 wants to continue having featuregate/Foo=false, he can set featuregate/Foo=false before upgrading. Let''s say the cluster-admin wants featuregate/Foo=false.'
items:
properties:
feature:
description: Feature is the key of feature gate. e.g. featuregate/Foo.
type: string
mode:
default: Disable
description: Mode is either Enable, Disable, "" where "" is Disable by default. In Enable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=true". In Disable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=false".
enum:
- Enable
- Disable
type: string
required:
- feature
type: object
type: array
type: object
workImagePullSpec:
default: quay.io/open-cluster-management/work
description: WorkImagePullSpec represents the desired image configuration of work controller/webhook installed on hub.
type: string
type: object
status:
description: Status represents the current status of controllers that govern the lifecycle of managed clusters.
properties:
conditions:
description: 'Conditions contain the different condition statuses for this ClusterManager. Valid condition types are: Applied: Components in hub are applied. Available: Components in hub are available and ready to serve. Progressing: Components in hub are in a transitioning state. Degraded: Components in hub do not match the desired configuration and only provide degraded service.'
items:
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
generations:
description: Generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.
items:
description: GenerationStatus keeps track of the generation for a given resource so that decisions about forced updates can be made. The definition matches the GenerationStatus defined in github.com/openshift/api/v1
properties:
group:
description: group is the group of the resource that you're tracking
type: string
lastGeneration:
description: lastGeneration is the last generation of the resource that controller applies
format: int64
type: integer
name:
description: name is the name of the resource that you're tracking
type: string
namespace:
description: namespace is where the resource that you're tracking is
type: string
resource:
description: resource is the resource type of the resource that you're tracking
type: string
version:
description: version is the version of the resource that you're tracking
type: string
type: object
type: array
observedGeneration:
description: ObservedGeneration is the last generation change you've dealt with
format: int64
type: integer
relatedResources:
description: RelatedResources are used to track the resources that are related to this ClusterManager.
items:
description: RelatedResourceMeta represents the resource that is managed by an operator
properties:
group:
description: group is the group of the resource that you're tracking
type: string
name:
description: name is the name of the resource that you're tracking
type: string
namespace:
description: namespace is where the thing you're tracking is
type: string
resource:
description: resource is the resource type of the resource that you're tracking
type: string
version:
description: version is the version of the thing you're tracking
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

2
deploy/cluster-manager/olm-catalog/cluster-manager/cluster-manager.package.yaml
View File

@@ -1,5 +1,5 @@
channels:
- name: stable
currentCSV: cluster-manager.v0.11.0
currentCSV: cluster-manager.v0.12.0
defaultChannel: stable
packageName: cluster-manager

58
deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml
View File

@@ -11,14 +11,6 @@ metadata:
"name": "cluster-manager"
},
"spec": {
"addOnManagerConfiguration": {
"featureGates": [
{
"feature": "AddonManagement",
"mode": "Enable"
}
]
},
"addOnManagerImagePullSpec": "quay.io/open-cluster-management/addon-manager",
"deployOption": {
"mode": "Default"
@@ -29,30 +21,10 @@ metadata:
{
"feature": "DefaultClusterSet",
"mode": "Enable"
},
{
"feature": "V1beta1CSRAPICompatibility",
"mode": "Enable"
},
{
"feature": "ManagedClusterAutoApproval",
"mode": "Enable"
}
]
},
"registrationImagePullSpec": "quay.io/open-cluster-management/registration",
"workConfiguration": {
"featureGates": [
{
"feature": "ManifestWorkReplicaSet",
"mode": "Enable"
},
{
"feature": "NilExecutorValidating",
"mode": "Enable"
}
]
},
"workImagePullSpec": "quay.io/open-cluster-management/work"
}
},
@@ -87,13 +59,13 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/open-cluster-management/registration-operator:latest
createdAt: "2023-02-17T20:00:31Z"
createdAt: "2023-05-24T20:00:31Z"
description: Manages the installation and upgrade of the ClusterManager.
operators.operatorframework.io/builder: operator-sdk-v1.1.0
operators.operatorframework.io/project_layout: go
repository: https://github.com/open-cluster-management-io/registration-operator
support: Red Hat, Inc.
name: cluster-manager.v0.11.0
name: cluster-manager.v0.12.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -115,18 +87,10 @@ spec:
```
$ kubectl get pods -n open-cluster-management-hub
NAME READY STATUS RESTARTS AGE
cluster-manager-placement-controller-d76cffb7c-fvzjh 1/1 Running 0 22h
cluster-manager-placement-controller-d76cffb7c-qnpjl 1/1 Running 0 22h
cluster-manager-placement-controller-d76cffb7c-tt4h6 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-btmpp 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-gt6fv 1/1 Running 0 22h
cluster-manager-registration-controller-66b7c65849-pl46k 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-crr69 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-s2dkb 1/1 Running 0 22h
cluster-manager-registration-webhook-5f5499fccf-s7lp5 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-ddz2d 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-kd92j 1/1 Running 0 22h
cluster-manager-work-webhook-b68fc9b84-vdbkl 1/1 Running 0 22h
cluster-manager-placement-controller-dbcfd4975-26jpw 1/1 Running 0 61m
cluster-manager-registration-controller-7949d97899-wwtg4 1/1 Running 0 61m
cluster-manager-registration-webhook-7f675bc4bb-v4rhj 1/1 Running 0 61m
cluster-manager-work-webhook-6c9d65fb95-jh97b 1/1 Running 0 61m
```
There is a ManagedCluster created in the Hub cluster when the managed cluster is registered to the Hub cluster.
@@ -462,11 +426,11 @@ spec:
verbs:
- renew
- apiGroups:
- register.open-cluster-management.io
- register.open-cluster-management.io
resources:
- managedclusters/accept
- managedclusters/accept
verbs:
- update
- update
- apiGroups:
- work.open-cluster-management.io
resources:
@@ -615,8 +579,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: cluster-manager.v0.10.0
replaces: cluster-manager.v0.11.0
selector:
matchLabels:
app: cluster-manager
version: 0.11.0
version: 0.12.0

14
deploy/klusterlet/config/manifests/bases/klusterlet.clusterserviceversion.yaml
View File

@@ -7,7 +7,7 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/open-cluster-management/registration-operator:latest
createdAt: "2023-02-17T20:00:31Z"
createdAt: "2023-05-24T20:00:31Z"
description: Manages the installation and upgrade of the Klusterlet.
repository: https://github.com/open-cluster-management-io/registration-operator
support: Red Hat, Inc.
@@ -44,12 +44,8 @@ spec:
```
$ kubectl get pods -n open-cluster-management-agent
NAME READY STATUS RESTARTS AGE
klusterlet-registration-agent-7fdd5b549b-4q88s 1/1 Running 0 27s
klusterlet-registration-agent-7fdd5b549b-ccdgn 1/1 Running 0 27s
klusterlet-registration-agent-7fdd5b549b-djhl9 1/1 Running 0 27s
klusterlet-work-agent-cbbb7f945-g7m45 1/1 Running 0 27s
klusterlet-work-agent-cbbb7f945-mxdbg 1/1 Running 1 27s
klusterlet-work-agent-cbbb7f945-pnjxk 1/1 Running 0 27s
klusterlet-registration-agent-86b4858546-w5t7x 1/1 Running 1 65m
klusterlet-work-agent-94d67fb4b-985sr 1/1 Running 0 64m
```
There is a ManagedCluster created in the Hub cluster.
@@ -91,8 +87,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: klusterlet.v0.10.0
replaces: klusterlet.v0.11.0
selector:
matchLabels:
app: klusterlet
version: 0.11.0
version: 0.12.0

325
deploy/klusterlet/olm-catalog/klusterlet/0.11.0/klusterlet.clusterserviceversion.yaml Normal file
View File

File diff suppressed because one or more lines are too long

274
deploy/klusterlet/olm-catalog/klusterlet/0.11.0/operator.open-cluster-management.io_klusterlets.yaml Normal file
View File

@@ -0,0 +1,274 @@
apiVersion: apiextensions.k8s.io/v1
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
versions:
- name: v1
schema:
openAPIV3Schema:
description: Klusterlet represents controllers to install the resources for a managed cluster. When configured, the Klusterlet requires a secret named bootstrap-hub-kubeconfig in the agent namespace to allow API requests to the hub for the registration protocol. In Hosted mode, the Klusterlet requires an additional secret named external-managed-kubeconfig in the agent namespace to allow API requests to the managed cluster for resources installation.
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.
properties:
clusterName:
description: ClusterName is the name of the managed cluster to be created on hub. The Klusterlet agent generates a random name if it is not set, or discovers the appropriate cluster name on OpenShift.
maxLength: 63
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
type: string
deployOption:
description: DeployOption contains the options of deploying a klusterlet
properties:
mode:
description: 'Mode can be Default or Hosted. It is Default mode if not specified In Default mode, all klusterlet related resources are deployed on the managed cluster. In Hosted mode, only crd and configurations are installed on the spoke/managed cluster. Controllers run in another cluster (defined as management-cluster) and connect to the mangaged cluster with the kubeconfig in secret of "external-managed-kubeconfig"(a kubeconfig of managed-cluster with cluster-admin permission). Note: Do not modify the Mode field once it''s applied.'
type: string
type: object
externalServerURLs:
description: ExternalServerURLs represents the a list of apiserver urls and ca bundles that is accessible externally If it is set empty, managed cluster has no externally accessible url that hub cluster can visit.
items:
description: ServerURL represents the apiserver url and ca bundle that is accessible externally
properties:
caBundle:
description: CABundle is the ca bundle to connect to apiserver of the managed cluster. System certs are used if it is not set.
format: byte
type: string
url:
description: URL is the url of apiserver endpoint of the managed cluster.
type: string
type: object
type: array
hubApiServerHostAlias:
description: HubApiServerHostAlias contains the host alias for hub api server. registration-agent and work-agent will use it to communicate with hub api server.
properties:
hostname:
description: Hostname for the above IP address.
pattern: ^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$
type: string
ip:
description: IP address of the host file entry.
pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
type: string
required:
- hostname
- ip
type: object
namespace:
description: Namespace is the namespace to deploy the agent on the managed cluster. The namespace must have a prefix of "open-cluster-management-", and if it is not set, the namespace of "open-cluster-management-agent" is used to deploy agent. In addition, the add-ons are deployed to the namespace of "{Namespace}-addon". In the Hosted mode, this namespace still exists on the managed cluster to contain necessary resources, like service accounts, roles and rolebindings, while the agent is deployed to the namespace with the same name as klusterlet on the management cluster.
maxLength: 63
pattern: ^open-cluster-management-[-a-z0-9]*[a-z0-9]$
type: string
nodePlacement:
description: NodePlacement enables explicit control over the scheduling of the deployed pods.
properties:
nodeSelector:
additionalProperties:
type: string
description: NodeSelector defines which Nodes the Pods are scheduled on. The default is an empty list.
type: object
tolerations:
description: Tolerations is attached by pods to tolerate any taint that matches the triple <key,value,effect> using the matching operator <operator>. The default is an empty list.
items:
description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
type: string
key:
description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
type: string
operator:
description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
type: string
type: object
type: array
type: object
registrationConfiguration:
description: RegistrationConfiguration contains the configuration of registration
properties:
clientCertExpirationSeconds:
description: clientCertExpirationSeconds represents the seconds of a client certificate to expire. If it is not set or 0, the default duration seconds will be set by the hub cluster. If the value is larger than the max signing duration seconds set on the hub cluster, the max signing duration seconds will be set.
format: int32
type: integer
featureGates:
description: 'FeatureGates represents the list of feature gates for registration If it is set empty, default feature gates will be used. If it is set, featuregate/Foo is an example of one item in FeatureGates: 1. If featuregate/Foo does not exist, registration-operator will discard it 2. If featuregate/Foo exists and is false by default. It is now possible to set featuregate/Foo=[false|true] 3. If featuregate/Foo exists and is true by default. If a cluster-admin upgrading from 1 to 2 wants to continue having featuregate/Foo=false, he can set featuregate/Foo=false before upgrading. Let''s say the cluster-admin wants featuregate/Foo=false.'
items:
properties:
feature:
description: Feature is the key of feature gate. e.g. featuregate/Foo.
type: string
mode:
default: Disable
description: Mode is either Enable, Disable, "" where "" is Disable by default. In Enable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=true". In Disable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=false".
enum:
- Enable
- Disable
type: string
required:
- feature
type: object
type: array
type: object
registrationImagePullSpec:
description: RegistrationImagePullSpec represents the desired image configuration of registration agent. quay.io/open-cluster-management.io/registration:latest will be used if unspecified.
type: string
workConfiguration:
description: WorkConfiguration contains the configuration of work
properties:
featureGates:
description: 'FeatureGates represents the list of feature gates for work If it is set empty, default feature gates will be used. If it is set, featuregate/Foo is an example of one item in FeatureGates: 1. If featuregate/Foo does not exist, registration-operator will discard it 2. If featuregate/Foo exists and is false by default. It is now possible to set featuregate/Foo=[false|true] 3. If featuregate/Foo exists and is true by default. If a cluster-admin upgrading from 1 to 2 wants to continue having featuregate/Foo=false, he can set featuregate/Foo=false before upgrading. Let''s say the cluster-admin wants featuregate/Foo=false.'
items:
properties:
feature:
description: Feature is the key of feature gate. e.g. featuregate/Foo.
type: string
mode:
default: Disable
description: Mode is either Enable, Disable, "" where "" is Disable by default. In Enable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=true". In Disable mode, a valid feature gate `featuregate/Foo` will be set to "--featuregate/Foo=false".
enum:
- Enable
- Disable
type: string
required:
- feature
type: object
type: array
type: object
workImagePullSpec:
description: WorkImagePullSpec represents the desired image configuration of work agent. quay.io/open-cluster-management.io/work:latest will be used if unspecified.
type: string
type: object
status:
description: Status represents the current status of Klusterlet agent.
properties:
conditions:
description: 'Conditions contain the different condition statuses for this Klusterlet. Valid condition types are: Applied: Components have been applied in the managed cluster. Available: Components in the managed cluster are available and ready to serve. Progressing: Components in the managed cluster are in a transitioning state. Degraded: Components in the managed cluster do not match the desired configuration and only provide degraded service.'
items:
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
generations:
description: Generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.
items:
description: GenerationStatus keeps track of the generation for a given resource so that decisions about forced updates can be made. The definition matches the GenerationStatus defined in github.com/openshift/api/v1
properties:
group:
description: group is the group of the resource that you're tracking
type: string
lastGeneration:
description: lastGeneration is the last generation of the resource that controller applies
format: int64
type: integer
name:
description: name is the name of the resource that you're tracking
type: string
namespace:
description: namespace is where the resource that you're tracking is
type: string
resource:
description: resource is the resource type of the resource that you're tracking
type: string
version:
description: version is the version of the resource that you're tracking
type: string
type: object
type: array
observedGeneration:
description: ObservedGeneration is the last generation change you've dealt with
format: int64
type: integer
relatedResources:
description: RelatedResources are used to track the resources that are related to this Klusterlet.
items:
description: RelatedResourceMeta represents the resource that is managed by an operator
properties:
group:
description: group is the group of the resource that you're tracking
type: string
name:
description: name is the name of the resource that you're tracking
type: string
namespace:
description: namespace is where the thing you're tracking is
type: string
resource:
description: resource is the resource type of the resource that you're tracking
type: string
version:
description: version is the version of the thing you're tracking
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

2
deploy/klusterlet/olm-catalog/klusterlet/klusterlet.package.yaml
View File

@@ -1,5 +1,5 @@
channels:
- currentCSV: klusterlet.v0.11.0
- currentCSV: klusterlet.v0.12.0
name: stable
defaultChannel: stable
packageName: klusterlet

16
deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml
View File

@@ -38,13 +38,13 @@ metadata:
categories: Integration & Delivery,OpenShift Optional
certified: "false"
containerImage: quay.io/open-cluster-management/registration-operator:latest
createdAt: "2023-02-17T20:00:31Z"
createdAt: "2023-05-24T20:00:31Z"
description: Manages the installation and upgrade of the Klusterlet.
operators.operatorframework.io/builder: operator-sdk-v1.1.0
operators.operatorframework.io/project_layout: go
repository: https://github.com/open-cluster-management-io/registration-operator
support: Red Hat, Inc.
name: klusterlet.v0.11.0
name: klusterlet.v0.12.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -77,12 +77,8 @@ spec:
```
$ kubectl get pods -n open-cluster-management-agent
NAME READY STATUS RESTARTS AGE
klusterlet-registration-agent-7fdd5b549b-4q88s 1/1 Running 0 27s
klusterlet-registration-agent-7fdd5b549b-ccdgn 1/1 Running 0 27s
klusterlet-registration-agent-7fdd5b549b-djhl9 1/1 Running 0 27s
klusterlet-work-agent-cbbb7f945-g7m45 1/1 Running 0 27s
klusterlet-work-agent-cbbb7f945-mxdbg 1/1 Running 1 27s
klusterlet-work-agent-cbbb7f945-pnjxk 1/1 Running 0 27s
klusterlet-registration-agent-86b4858546-w5t7x 1/1 Running 1 65m
klusterlet-work-agent-94d67fb4b-985sr 1/1 Running 0 64m
```
There is a ManagedCluster created in the Hub cluster.
@@ -322,8 +318,8 @@ spec:
maturity: alpha
provider:
name: Red Hat, Inc.
replaces: klusterlet.v0.10.0
replaces: klusterlet.v0.11.0
selector:
matchLabels:
app: klusterlet
version: 0.11.0
version: 0.12.0