mirror of
https://github.com/jenkinsci/kubernetes-operator.git
synced 2026-10-21 04:23:25 +02:00
Prepare for Security Validator release (#680)
* Tidy up k8s events logging * Increase memory and decrease CPU in resources * Standarize API fields * Refactor tests * Change image and resources for e2e tests * Increase readability
This commit is contained in:
@@ -36,10 +36,6 @@ spec:
|
||||
spec:
|
||||
description: Spec defines the desired state of the Jenkins
|
||||
properties:
|
||||
ValidateSecurityWarnings:
|
||||
description: ValidateSecurityWarnings enables or disables validating
|
||||
potential security warnings in Jenkins plugins via admission webhooks.
|
||||
type: boolean
|
||||
backup:
|
||||
description: 'Backup defines configuration of Jenkins backup More
|
||||
info: https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configure-backup-and-restore/'
|
||||
@@ -1108,6 +1104,22 @@ spec:
|
||||
description: DisableCSRFProtection allows you to toggle CSRF Protection
|
||||
on Jenkins
|
||||
type: boolean
|
||||
hostAliases:
|
||||
description: HostAliases for Jenkins master pod and SeedJob agent
|
||||
items:
|
||||
description: HostAlias holds the mapping between IP and hostnames
|
||||
that will be injected as an entry in the pod's hosts file.
|
||||
properties:
|
||||
hostnames:
|
||||
description: Hostnames for the above IP address.
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
ip:
|
||||
description: IP address of the host file entry.
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
imagePullSecrets:
|
||||
description: 'ImagePullSecrets is an optional list of references
|
||||
to secrets in the same namespace to use for pulling any of the
|
||||
@@ -3320,6 +3332,10 @@ spec:
|
||||
More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services---service-types'
|
||||
type: string
|
||||
type: object
|
||||
validateSecurityWarnings:
|
||||
description: ValidateSecurityWarnings enables or disables validating
|
||||
potential security warnings in Jenkins plugins via admission webhooks.
|
||||
type: boolean
|
||||
required:
|
||||
- jenkinsAPISettings
|
||||
- master
|
||||
|
||||
@@ -145,7 +145,7 @@ spec:
|
||||
securityContext:
|
||||
{{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
ValidateSecurityWarnings: {{ .Values.jenkins.ValidateSecurityWarnings }}
|
||||
validateSecurityWarnings: {{ .Values.jenkins.validateSecurityWarnings }}
|
||||
{{- with .Values.jenkins.seedJobs }}
|
||||
seedJobs: {{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
|
||||
@@ -48,8 +48,8 @@ jenkins:
|
||||
disableCSRFProtection: false
|
||||
|
||||
|
||||
# ValidateSecurityWarnings enables or disables validating potential security warnings in Jenkins plugins via admission webhooks.
|
||||
ValidateSecurityWarnings: false
|
||||
# validateSecurityWarnings enables or disables validating potential security warnings in Jenkins plugins via admission webhooks.
|
||||
validateSecurityWarnings: false
|
||||
|
||||
# imagePullSecrets is used if you want to pull images from private repository
|
||||
# See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configuration/#pulling-docker-images-from-private-repositories for more info
|
||||
@@ -110,7 +110,7 @@ jenkins:
|
||||
# See https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ for details
|
||||
resources:
|
||||
limits:
|
||||
cpu: 1500m
|
||||
cpu: 1000m
|
||||
memory: 3Gi
|
||||
requests:
|
||||
cpu: 1
|
||||
@@ -146,26 +146,26 @@ jenkins:
|
||||
|
||||
# LivenessProbe for Jenkins Master pod
|
||||
livenessProbe:
|
||||
failureThreshold: 12
|
||||
failureThreshold: 20
|
||||
httpGet:
|
||||
path: /login
|
||||
port: http
|
||||
scheme: HTTP
|
||||
initialDelaySeconds: 80
|
||||
initialDelaySeconds: 100
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 5
|
||||
timeoutSeconds: 8
|
||||
# ReadinessProbe for Jenkins Master pod
|
||||
readinessProbe:
|
||||
failureThreshold: 3
|
||||
failureThreshold: 60
|
||||
httpGet:
|
||||
path: /login
|
||||
port: http
|
||||
scheme: HTTP
|
||||
initialDelaySeconds: 30
|
||||
initialDelaySeconds: 120
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
timeoutSeconds: 8
|
||||
|
||||
# backup is section for configuring operator's backup feature
|
||||
# By default backup feature is enabled and pre-configured
|
||||
@@ -215,11 +215,11 @@ jenkins:
|
||||
# resources used by backup container
|
||||
resources:
|
||||
limits:
|
||||
cpu: 1500m
|
||||
memory: 1Gi
|
||||
cpu: 1000m
|
||||
memory: 2Gi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 256Mi
|
||||
memory: 500Mi
|
||||
|
||||
# env contains container environment variables
|
||||
# PVC backup provider handles these variables:
|
||||
|
||||
Reference in New Issue
Block a user