Merge branch 'master' into brs3

manifests/crd.yaml

@@ -828,16 +828,6 @@ spec:
                     replication:
                       description: PDReplicationConfig is the replication configuration.
                       properties:
-                        location-labels:
-                          description: The label keys specified the location of a
-                            store. The placement priorities is implied by the order
-                            of label keys. For example, ["zone", "rack"] means that
-                            we should place replicas to different zones first, then
-                            to different racks if we don't have enough zones. Immutable,
-                            change should be made through pd-ctl after cluster creation
-                          items:
-                            type: string
-                          type: array
                         max-replicas:
                           description: 'MaxReplicas is the number of replicas for
                             each region. Immutable, change should be made through

pkg/apis/pingcap/v1alpha1/pd_config.go

@@ -175,6 +175,7 @@ type PDReplicationConfig struct {
 	// For example, ["zone", "rack"] means that we should place replicas to
 	// different zones first, then to different racks if we don't have enough zones.
 	// Immutable, change should be made through pd-ctl after cluster creation
+	// +k8s:openapi-gen=false
 	// +optional
 	LocationLabels StringSlice `toml:"location-labels,omitempty" json:"location-labels,omitempty"`
 	// StrictlyMatchLabel strictly checks if the label of TiKV is matched with LocaltionLabels.