Skip to content

Commit 1072a66

Browse files
Vincent056Vincent056
authored
Merge pull request #1140 from yuumasato/update-gomodules-2
CMP-4216: Upgrade some more gomodules
2 parents e453026 + a833fec commit 1072a66

6,181 files changed

Lines changed: 455287 additions & 655394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/manager/operator.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,16 +687,18 @@ func getDefaultRoles(platform PlatformType) []string {
687687
func generateOperatorServiceMonitor(service *v1.Service, namespace string) *monitoring.ServiceMonitor {
688688
serviceMonitor := GenerateServiceMonitor(service)
689689
m := "metrics." + namespace + ".svc"
690+
scheme := monitoring.Scheme("https")
690691
for i := range serviceMonitor.Spec.Endpoints {
691692
if serviceMonitor.Spec.Endpoints[i].Port == ctrlMetrics.ControllerMetricsServiceName {
692693
serviceMonitor.Spec.Endpoints[i].Path = ctrlMetrics.HandlerPath
693-
serviceMonitor.Spec.Endpoints[i].Scheme = "https"
694-
serviceMonitor.Spec.Endpoints[i].TLSConfig = &monitoring.TLSConfig{
694+
serviceMonitor.Spec.Endpoints[i].Scheme = &scheme
695+
tlsConfig := &monitoring.TLSConfig{
695696
SafeTLSConfig: monitoring.SafeTLSConfig{
696697
ServerName: &m,
697698
},
698-
CAFile: serviceMonitorTLSCAFile,
699699
}
700+
tlsConfig.CAFile = serviceMonitorTLSCAFile
701+
serviceMonitor.Spec.Endpoints[i].TLSConfig = tlsConfig
700702
}
701703
}
702704
return serviceMonitor

‎config/crd/bases/compliance.openshift.io_compliancecheckresults.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: compliancecheckresults.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_complianceremediations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: complianceremediations.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_compliancescans.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: compliancescans.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io
@@ -175,9 +175,10 @@ spec:
175175
operator:
176176
description: |-
177177
Operator represents a key's relationship to the value.
178-
Valid operators are Exists and Equal. Defaults to Equal.
178+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
179179
Exists is equivalent to wildcard for value, so that a pod can
180180
tolerate all taints of a particular category.
181+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
181182
type: string
182183
tolerationSeconds:
183184
description: |-
@@ -250,9 +251,10 @@ spec:
250251
operator:
251252
description: |-
252253
Operator represents a key's relationship to the value.
253-
Valid operators are Exists and Equal. Defaults to Equal.
254+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
254255
Exists is equivalent to wildcard for value, so that a pod can
255256
tolerate all taints of a particular category.
257+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
256258
type: string
257259
tolerationSeconds:
258260
description: |-

‎config/crd/bases/compliance.openshift.io_compliancesuites.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: compliancesuites.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io
@@ -194,9 +194,10 @@ spec:
194194
operator:
195195
description: |-
196196
Operator represents a key's relationship to the value.
197-
Valid operators are Exists and Equal. Defaults to Equal.
197+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
198198
Exists is equivalent to wildcard for value, so that a pod can
199199
tolerate all taints of a particular category.
200+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
200201
type: string
201202
tolerationSeconds:
202203
description: |-
@@ -269,9 +270,10 @@ spec:
269270
operator:
270271
description: |-
271272
Operator represents a key's relationship to the value.
272-
Valid operators are Exists and Equal. Defaults to Equal.
273+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
273274
Exists is equivalent to wildcard for value, so that a pod can
274275
tolerate all taints of a particular category.
276+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
275277
type: string
276278
tolerationSeconds:
277279
description: |-

‎config/crd/bases/compliance.openshift.io_customrules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: customrules.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_profilebundles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: profilebundles.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_profiles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: profiles.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_rules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: rules.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

‎config/crd/bases/compliance.openshift.io_scansettingbindings.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: scansettingbindings.compliance.openshift.io
88
spec:
99
group: compliance.openshift.io

0 commit comments

Comments
 (0)