Skip to content

Commit 60f60c5

Browse files
belgaied2belgaied2
committed
Removed parts of the newly added API objects, did a make generate and its pre-requisite of go version in go.mod
Signed-off-by: Mohamed Belgaied Hassine <[email protected]>
1 parent 41d4bd4 commit 60f60c5

File tree

6 files changed

+29
-355
lines changed

6 files changed

+29
-355
lines changed

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml‎

Lines changed: 24 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,6 @@ spec:
6262
spec:
6363
description: GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane.
6464
properties:
65-
addonsConfig:
66-
description: AddonsConfig defines the enabled Cluster Addons.
67-
properties:
68-
GCEPersistentDiskCsiDriver:
69-
description: GCEPersistentDiskCsiDriver whether the Compute Engine
70-
PD CSI driver is enabled for this cluster.
71-
type: boolean
72-
GCPFileStoreCsiDriver:
73-
description: GCPFileStoreCsiDriver whether the GCP Filestore CSI
74-
driver is enabled for this cluster.
75-
type: boolean
76-
GKEBackup:
77-
description: GKEBackup whether the Backup for GKE agent is enabled
78-
for this cluster.
79-
type: boolean
80-
ImageStreaming:
81-
description: ImageStreaming whether to use GCFS (Google Container
82-
File System).
83-
type: boolean
84-
cloudRun:
85-
description: CloudRun enable the Cloud Run addon, which allows the
86-
user to use a managed Knative service.
87-
type: boolean
88-
kalmConfig:
89-
description: KalmConfig enable the KALM addon, which manages the
90-
lifecycle of k8s applications.
91-
type: boolean
92-
type: object
9365
clusterName:
9466
description: |-
9567
ClusterName allows you to specify the name of the GKE cluster.
@@ -104,108 +76,64 @@ spec:
10476
it gets the IP address.
10577
properties:
10678
cidrBlock:
107-
description: CidrBlock is where all pods in the cluster are
108-
assigned an IP address from this range. Enter a range (in
109-
CIDR notation) within a network range, a mask, or leave
110-
this field blank to use a default range. This setting is
111-
permanent.
79+
description: |-
80+
CidrBlock is where all pods in the cluster are assigned an IP address from this range. Enter a range
81+
(in CIDR notation) within a network range, a mask, or leave this field blank to use a default range.
82+
This setting is permanent.
11283
type: string
11384
type: object
11485
privateCluster:
11586
description: PrivateCluster defines the private cluster spec.
11687
properties:
11788
controlPlaneCidrBlock:
118-
description: ControlPlaneCidrBlock is the IP range in CIDR
119-
notation to use for the hosted master network. This range
120-
must not overlap with any other ranges in use within the
121-
cluster's network. Honored when enabled is true.
89+
description: |-
90+
ControlPlaneCidrBlock is the IP range in CIDR notation to use for the hosted master network. This range must not
91+
overlap with any other ranges in use within the cluster's network. Honored when enabled is true.
12292
type: string
12393
controlPlaneGlobalAccess:
12494
description: ControlPlaneGlobalAccess is whenever master is
12595
accessible globally or not. Honored when enabled is true.
12696
type: boolean
12797
disableDefaultSNAT:
128-
description: DisableDefaultSNAT is disables cluster default
129-
sNAT rules. Honored when enabled is true.
98+
description: DisableDefaultSNAT disables cluster default sNAT
99+
rules. Honored when enabled is true.
130100
type: boolean
131101
enablePrivateEndpoint:
132-
description: 'EnablePrivateEndpoint: Whether the master''s
133-
internal IP address is used as the cluster endpoint.'
102+
description: |-
103+
EnablePrivateEndpoint: Whether the master's internal IP
104+
address is used as the cluster endpoint.
134105
type: boolean
135106
enablePrivateNodes:
136-
description: 'EnablePrivateNodes: Whether nodes have internal
137-
IP addresses only. If enabled, all nodes are given only
138-
RFC 1918 private addresses and communicate with the master
139-
via private networking.'
107+
description: |-
108+
EnablePrivateNodes: Whether nodes have internal IP
109+
addresses only. If enabled, all nodes are given only RFC
110+
1918 private addresses and communicate with the master via
111+
private networking.
140112
type: boolean
141113
type: object
142114
service:
143115
description: Service defines the range of CIDRBlock list from
144116
where it gets the IP address.
145117
properties:
146118
cidrBlock:
147-
description: CidrBlock is where cluster services will be assigned
148-
an IP address from this IP address range. Enter a range
149-
(in CIDR notation) within a network range, a mask, or leave
150-
this field blank to use a default range. This setting is
151-
permanent.
119+
description: |-
120+
CidrBlock is where cluster services will be assigned an IP address from this IP address range. Enter a range
121+
(in CIDR notation) within a network range, a mask, or leave this field blank to use a default range.
122+
This setting is permanent.
152123
type: string
153124
type: object
154125
useIPAliases:
155-
description: UseIPAliases is whether alias IPs will be used for
156-
pod IPs in the cluster. If false, routes will be used for pod
157-
IPs in the cluster.
126+
description: |-
127+
UseIPAliases is whether alias IPs will be used for pod IPs in the cluster. If false, routes will be used for
128+
pod IPs in the cluster.
158129
type: boolean
159130
type: object
160-
clusterSecurity:
161-
description: ClusterSecurity defines the cluster security.
162-
properties:
163-
authenticatorGroupConfig:
164-
description: AuthenticatorGroupConfig is RBAC security group for
165-
use with Google security groups in Kubernetes RBAC.
166-
properties:
167-
securityGroups:
168-
description: SecurityGroups is the name of the security group-of-groups
169-
to be used.
170-
type: string
171-
type: object
172-
enableLegacyAuthorization:
173-
description: EnableLegacyAuthorization Whether the legacy (ABAC)
174-
authorizer is enabled for this cluster.
175-
type: boolean
176-
issueClientCertificate:
177-
description: IssueClientCertificate is weather to issue a client
178-
certificate.
179-
type: boolean
180-
workloadIdentityConfig:
181-
description: WorkloadIdentityConfig allows workloads in your GKE
182-
clusters to impersonate Identity and Access Management (IAM)
183-
service accounts to access Google Cloud services
184-
properties:
185-
workloadPool:
186-
description: WorkloadPool is the workload pool to attach all
187-
Kubernetes service accounts to Google Cloud services. Only
188-
relevant when enabled is true
189-
type: string
190-
type: object
191-
type: object
192131
controlPlaneVersion:
193132
description: |-
194133
ControlPlaneVersion represents the control plane version of the GKE cluster.
195134
If not specified, the default version currently supported by GKE will be
196135
used.
197136
type: string
198-
defaultMaxPodsPerNode:
199-
description: DefaultMaXPodsPerNode is the maximum number of pods can
200-
be run simultaneously on a Node, and only honored if Cluster is
201-
created with IP Alias support.
202-
type: integer
203-
defaultNodeLocation:
204-
description: DefaultNodeLocation is the list of Google Compute Engine
205-
zones in which the cluster's Node should be located.
206-
items:
207-
type: string
208-
type: array
209137
description:
210138
description: Description describe the cluster.
211139
type: string
@@ -233,26 +161,6 @@ spec:
233161
Location represents the location (region or zone) in which the GKE cluster
234162
will be created.
235163
type: string
236-
loggingConfig:
237-
description: LoggingConfig defines the logging on Cluster.
238-
properties:
239-
apiServer:
240-
description: APIServer enables the api server logging.
241-
type: boolean
242-
controllerManager:
243-
description: ControllerManager enables the controller manager
244-
logging.
245-
type: boolean
246-
scheduler:
247-
description: Scheduler enables the scheduler logging.
248-
type: boolean
249-
systemComponents:
250-
description: SystemComponents enables the system component logging.
251-
type: boolean
252-
workloads:
253-
description: Workloads enables the Workloads logging.
254-
type: boolean
255-
type: object
256164
master_authorized_networks_config:
257165
description: |-
258166
MasterAuthorizedNetworksConfig represents configuration options for master authorized networks feature of the GKE cluster.
@@ -281,27 +189,6 @@ spec:
281189
Public IP addresses.
282190
type: boolean
283191
type: object
284-
monitoringConfig:
285-
description: MonitoringConfig defines the monitoring on Cluster.
286-
properties:
287-
apiServer:
288-
description: APIServer enables the api server monitoring.
289-
type: boolean
290-
controllerManager:
291-
description: ControllerManager enables the controller manager
292-
monitoring.
293-
type: boolean
294-
enableManagedPrometheus:
295-
description: EnableManagedPrometheus Enable Google Cloud Managed
296-
Service for Prometheus in the cluster.
297-
type: boolean
298-
scheduler:
299-
description: Scheduler enables the scheduler monitoring.
300-
type: boolean
301-
systemComponents:
302-
description: SystemComponents enables the system component monitoring.
303-
type: boolean
304-
type: object
305192
project:
306193
description: Project is the name of the project to deploy the cluster
307194
to.

‎config/default/manager_prometheus_metrics_patch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ spec:
1111
prometheus.io/scrape: 'true'
1212
spec:
1313
containers:
14-
# Expose the prometheus metrics on default port
14+
Expose the prometheus metrics on default port
1515
- name: manager
1616
ports:
1717
- containerPort: 8080
18-
name: metrics
18+
name: metrics2
1919
protocol: TCP

‎config/manager/manager.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
name: healthz
3434
protocol: TCP
3535
- containerPort: 8443
36-
name: metrics
36+
name: metrics-2
3737
protocol: TCP
3838
readinessProbe:
3939
httpGet:

‎exp/api/v1beta1/gcpmanagedcontrolplane_types.go‎

Lines changed: 1 addition & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type PrivateCluster struct {
5050
// +optional
5151
ControlPlaneGlobalAccess bool `json:"controlPlaneGlobalAccess,omitempty"`
5252

53-
// DisableDefaultSNAT is disables cluster default sNAT rules. Honored when enabled is true.
53+
// DisableDefaultSNAT disables cluster default sNAT rules. Honored when enabled is true.
5454
// +optional
5555
DisableDefaultSNAT bool `json:"disableDefaultSNAT,omitempty"`
5656
}
@@ -109,99 +109,6 @@ type AuthenticatorGroupConfig struct {
109109
SecurityGroups string `json:"securityGroups,omitempty"`
110110
}
111111

112-
// ClusterSecurity defines the cluster security.
113-
type ClusterSecurity struct {
114-
// WorkloadIdentityConfig allows workloads in your GKE clusters to impersonate Identity and Access Management (IAM)
115-
// service accounts to access Google Cloud services
116-
// +optional
117-
WorkloadIdentityConfig *WorkloadIdentityConfig `json:"workloadIdentityConfig,omitempty"`
118-
119-
// AuthenticatorGroupConfig is RBAC security group for use with Google security groups in Kubernetes RBAC.
120-
// +optional
121-
AuthenticatorGroupConfig *AuthenticatorGroupConfig `json:"authenticatorGroupConfig,omitempty"`
122-
123-
// EnableLegacyAuthorization Whether the legacy (ABAC) authorizer is enabled for this cluster.
124-
// +optional
125-
EnableLegacyAuthorization bool `json:"enableLegacyAuthorization,omitempty"`
126-
127-
// IssueClientCertificate is weather to issue a client certificate.
128-
// +optional
129-
IssueClientCertificate bool `json:"issueClientCertificate,omitempty"`
130-
}
131-
132-
// AddonsConfig defines the enabled Cluster Addons.
133-
type AddonsConfig struct {
134-
// CloudRun enable the Cloud Run addon, which allows the user to use a managed Knative service.
135-
// +optional
136-
CloudRun bool `json:"cloudRun,omitempty"`
137-
138-
// KalmConfig enable the KALM addon, which manages the lifecycle of k8s applications.
139-
// +optional
140-
KalmConfig bool `json:"kalmConfig,omitempty"`
141-
142-
// GKEBackup whether the Backup for GKE agent is enabled for this cluster.
143-
// +optional
144-
GKEBackup bool `json:"GKEBackup,omitempty"`
145-
146-
// GCEPersistentDiskCsiDriver whether the Compute Engine PD CSI driver is enabled for this cluster.
147-
// +optional
148-
GCEPersistentDiskCsiDriver bool `json:"GCEPersistentDiskCsiDriver,omitempty"`
149-
150-
// GCPFileStoreCsiDriver whether the GCP Filestore CSI driver is enabled for this cluster.
151-
// +optional
152-
GCPFileStoreCsiDriver bool `json:"GCPFileStoreCsiDriver,omitempty"`
153-
154-
// ImageStreaming whether to use GCFS (Google Container File System).
155-
// +optional
156-
ImageStreaming bool `json:"ImageStreaming,omitempty"`
157-
}
158-
159-
// LoggingConfig defines the logging on Cluster.
160-
type LoggingConfig struct {
161-
// SystemComponents enables the system component logging.
162-
// +optional
163-
SystemComponents bool `json:"systemComponents,omitempty"`
164-
165-
// Workloads enables the Workloads logging.
166-
// +optional
167-
Workloads bool `json:"workloads,omitempty"`
168-
169-
// APIServer enables the api server logging.
170-
// +optional
171-
APIServer bool `json:"apiServer,omitempty"`
172-
173-
// Scheduler enables the scheduler logging.
174-
// +optional
175-
Scheduler bool `json:"scheduler,omitempty"`
176-
177-
// ControllerManager enables the controller manager logging.
178-
// +optional
179-
ControllerManager bool `json:"controllerManager,omitempty"`
180-
}
181-
182-
// MonitoringConfig defines the monitoring on Cluster.
183-
type MonitoringConfig struct {
184-
// SystemComponents enables the system component monitoring.
185-
// +optional
186-
SystemComponents bool `json:"systemComponents,omitempty"`
187-
188-
// APIServer enables the api server monitoring.
189-
// +optional
190-
APIServer bool `json:"apiServer,omitempty"`
191-
192-
// Scheduler enables the scheduler monitoring.
193-
// +optional
194-
Scheduler bool `json:"scheduler,omitempty"`
195-
196-
// ControllerManager enables the controller manager monitoring.
197-
// +optional
198-
ControllerManager bool `json:"controllerManager,omitempty"`
199-
200-
// EnableManagedPrometheus Enable Google Cloud Managed Service for Prometheus in the cluster.
201-
// +optional
202-
EnableManagedPrometheus bool `json:"enableManagedPrometheus,omitempty"`
203-
}
204-
205112
// GCPManagedControlPlaneSpec defines the desired state of GCPManagedControlPlane.
206113
type GCPManagedControlPlaneSpec struct {
207114
// ClusterName allows you to specify the name of the GKE cluster.
@@ -218,31 +125,6 @@ type GCPManagedControlPlaneSpec struct {
218125
// +optional
219126
ClusterNetwork *ClusterNetwork `json:"clusterNetwork,omitempty"`
220127

221-
// ClusterSecurity defines the cluster security.
222-
// +optional
223-
ClusterSecurity *ClusterSecurity `json:"clusterSecurity,omitempty"`
224-
225-
// AddonsConfig defines the enabled Cluster Addons.
226-
// +optional
227-
AddonsConfig *AddonsConfig `json:"addonsConfig,omitempty"`
228-
229-
// LoggingConfig defines the logging on Cluster.
230-
// +optional
231-
LoggingConfig *LoggingConfig `json:"loggingConfig,omitempty"`
232-
233-
// MonitoringConfig defines the monitoring on Cluster.
234-
// +optional
235-
MonitoringConfig *MonitoringConfig `json:"monitoringConfig,omitempty"`
236-
237-
// DefaultNodeLocation is the list of Google Compute Engine zones in which the cluster's Node should be located.
238-
// +optional
239-
DefaultNodeLocation []string `json:"defaultNodeLocation,omitempty"`
240-
241-
// DefaultMaXPodsPerNode is the maximum number of pods can be run simultaneously on a Node, and only honored if
242-
// Cluster is created with IP Alias support.
243-
// +optional
244-
DefaultMaxPodsPerNode int `json:"defaultMaxPodsPerNode,omitempty"`
245-
246128
// Project is the name of the project to deploy the cluster to.
247129
Project string `json:"project"`
248130
// Location represents the location (region or zone) in which the GKE cluster

0 commit comments

Comments
 (0)