Skip to content

Commit 3ecdd72

Browse files
authored
Merge pull request #625 from jichenjc/remove_unused
cleanup keys params
2 parents b299334 + e6b7f22 commit 3ecdd72

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

api/v1alpha3/openstackcluster_types.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,6 @@ type OpenStackClusterSpec struct {
9999
// Tags for all resources in cluster
100100
Tags []string `json:"tags,omitempty"`
101101

102-
// CAKeyPair is the key pair for ca certs.
103-
CAKeyPair KeyPair `json:"caKeyPair,omitempty"`
104-
105-
//EtcdCAKeyPair is the key pair for etcd.
106-
EtcdCAKeyPair KeyPair `json:"etcdCAKeyPair,omitempty"`
107-
108-
// FrontProxyCAKeyPair is the key pair for FrontProxyKeyPair.
109-
FrontProxyCAKeyPair KeyPair `json:"frontProxyCAKeyPair,omitempty"`
110-
111-
// SAKeyPair is the service account key pair.
112-
SAKeyPair KeyPair `json:"saKeyPair,omitempty"`
113-
114102
// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
115103
// +optional
116104
ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`

api/v1alpha3/zz_generated.deepcopy.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,6 @@ spec:
7575
description: APIServerLoadBalancerPort is the port on which the listener
7676
on the APIServer loadbalancer will be created
7777
type: integer
78-
caKeyPair:
79-
description: CAKeyPair is the key pair for ca certs.
80-
properties:
81-
cert:
82-
description: base64 encoded cert and key
83-
format: byte
84-
type: string
85-
key:
86-
format: byte
87-
type: string
88-
type: object
8978
cloudName:
9079
description: The name of the cloud to use from the clouds secret
9180
type: string
@@ -134,17 +123,6 @@ spec:
134123
items:
135124
type: string
136125
type: array
137-
etcdCAKeyPair:
138-
description: EtcdCAKeyPair is the key pair for etcd.
139-
properties:
140-
cert:
141-
description: base64 encoded cert and key
142-
format: byte
143-
type: string
144-
key:
145-
format: byte
146-
type: string
147-
type: object
148126
externalNetworkId:
149127
description: ExternalNetworkID is the ID of an external OpenStack
150128
Network. This is necessary to get public internet to the VMs.
@@ -217,17 +195,6 @@ spec:
217195
- subnet
218196
type: object
219197
type: array
220-
frontProxyCAKeyPair:
221-
description: FrontProxyCAKeyPair is the key pair for FrontProxyKeyPair.
222-
properties:
223-
cert:
224-
description: base64 encoded cert and key
225-
format: byte
226-
type: string
227-
key:
228-
format: byte
229-
type: string
230-
type: object
231198
managedAPIServerLoadBalancer:
232199
description: 'ManagedAPIServerLoadBalancer defines whether a LoadBalancer
233200
for the APIServer should be created. If set to true the following
@@ -284,17 +251,6 @@ spec:
284251
connected to this subnet. If you leave this empty, no network will
285252
be created.
286253
type: string
287-
saKeyPair:
288-
description: SAKeyPair is the service account key pair.
289-
properties:
290-
cert:
291-
description: base64 encoded cert and key
292-
format: byte
293-
type: string
294-
key:
295-
format: byte
296-
type: string
297-
type: object
298254
subnet:
299255
description: If NodeCIDR cannot be set this can be used to detect
300256
an existing subnet.

0 commit comments

Comments
 (0)