Skip to content

Commit

Permalink
Unwrap advanced configuration section (#1541)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vlatombe
Vlatombe committed May 6, 2024
1 parent 9de581f commit 08850dd
Showing 1 changed file with 72 additions and 77 deletions.
149 changes: 72 additions & 77 deletions src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/config.jelly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,106 +23,101 @@ THE SOFTWARE.
<f:entry title="${%Name}" field="name">
<f:textbox default="kubernetes" clazz="required"/>
</f:entry>

<f:advanced title="Kubernetes Cloud details">

<f:entry title="${%Kubernetes URL}" field="serverUrl">
<f:textbox/>
</f:entry>
<f:entry title="${%Kubernetes URL}" field="serverUrl">
<f:textbox/>
</f:entry>

<f:entry title="${%Use Jenkins Proxy}" field="useJenkinsProxy">
<f:checkbox/>
</f:entry>
<f:entry title="${%Use Jenkins Proxy}" field="useJenkinsProxy">
<f:checkbox/>
</f:entry>

<f:entry title="${%Kubernetes server certificate key}" field="serverCertificate">
<f:textarea/>
</f:entry>
<f:entry title="${%Kubernetes server certificate key}" field="serverCertificate">
<f:textarea/>
</f:entry>

<f:entry title="${%Disable https certificate check}" field="skipTlsVerify">
<f:checkbox />
</f:entry>
<f:entry title="${%Disable https certificate check}" field="skipTlsVerify">
<f:checkbox />
</f:entry>

<f:entry title="${%Kubernetes Namespace}" field="namespace">
<f:textbox/>
</f:entry>
<f:entry title="${%Kubernetes Namespace}" field="namespace">
<f:textbox/>
</f:entry>

<f:entry title="${%Agent Docker Registry}" field="jnlpregistry">
<f:textbox/>
</f:entry>
<f:entry title="${%Agent Docker Registry}" field="jnlpregistry">
<f:textbox/>
</f:entry>

<f:entry title="${%Inject restricted PSS security context in agent container definition}" field="restrictedPssSecurityContext">
<f:checkbox/>
</f:entry>
<f:entry title="${%Inject restricted PSS security context in agent container definition}" field="restrictedPssSecurityContext">
<f:checkbox/>
</f:entry>

<f:entry title="${%Credentials}" field="credentialsId">
<c:select/>
</f:entry>
<f:entry title="${%Credentials}" field="credentialsId">
<c:select/>
</f:entry>

<f:validateButton title="${%Test Connection}" progress="${%Testing...}" method="testConnection" with="name,serverUrl,credentialsId,serverCertificate,skipTlsVerify,namespace,connectTimeout,readTimeout,useJenkinsProxy" />
<f:validateButton title="${%Test Connection}" progress="${%Testing...}" method="testConnection" with="name,serverUrl,credentialsId,serverCertificate,skipTlsVerify,namespace,connectTimeout,readTimeout,useJenkinsProxy" />

<f:entry title="${%WebSocket}" field="webSocket">
<f:checkbox/>
</f:entry>
<f:entry title="${%WebSocket}" field="webSocket">
<f:checkbox/>
</f:entry>

<f:entry title="${%Direct Connection}" field="directConnection">
<f:checkbox default="false" />
</f:entry>
<f:entry title="${%Direct Connection}" field="directConnection">
<f:checkbox default="false" />
</f:entry>

<f:entry title="${%Jenkins URL}" field="jenkinsUrl">
<f:textbox />
</f:entry>
<f:entry title="${%Jenkins URL}" field="jenkinsUrl">
<f:textbox />
</f:entry>

<f:entry title="${%Jenkins tunnel}" field="jenkinsTunnel">
<f:textbox />
</f:entry>
<f:entry title="${%Jenkins tunnel}" field="jenkinsTunnel">
<f:textbox />
</f:entry>

<f:entry title="${%Connection Timeout (seconds)}" field="connectTimeout">
<f:number min="${descriptor.defaultConnectTimeout}" default="${descriptor.defaultConnectTimeout}" checkMethod="post"/>
</f:entry>
<f:entry title="${%Connection Timeout (seconds)}" field="connectTimeout">
<f:number min="${descriptor.defaultConnectTimeout}" default="${descriptor.defaultConnectTimeout}" checkMethod="post"/>
</f:entry>

<f:entry title="${%Read Timeout (seconds)}" field="readTimeout">
<f:number min="${descriptor.defaultReadTimeout}" default="${descriptor.defaultReadTimeout}" checkMethod="post"/>
</f:entry>
<f:entry title="${%Read Timeout (seconds)}" field="readTimeout">
<f:number min="${descriptor.defaultReadTimeout}" default="${descriptor.defaultReadTimeout}" checkMethod="post"/>
</f:entry>

<f:entry title="${%Concurrency Limit}" field="containerCapStr">
<f:number default="10"/>
</f:entry>
<f:entry title="${%Concurrency Limit}" field="containerCapStr">
<f:number default="10"/>
</f:entry>

<f:entry title="${%Pod Labels}" field="podLabels">
<f:repeatableHeteroProperty field="podLabels" hasHeader="true" addCaption="${%Add Pod Label}"
deleteCaption="${%Delete Pod Label}" />
</f:entry>
<f:entry title="${%Pod Labels}" field="podLabels">
<f:repeatableHeteroProperty field="podLabels" hasHeader="true" addCaption="${%Add Pod Label}"
deleteCaption="${%Delete Pod Label}" />
</f:entry>

<f:advanced title="${%Pod Retention}">
<f:dropdownDescriptorSelector title="${%Pod Retention}" field="podRetention"
descriptors="${descriptor.allowedPodRetentions}" default="${descriptor.defaultPodRetention}" />
</f:advanced>
<f:advanced title="${%Pod Retention}">
<f:dropdownDescriptorSelector title="${%Pod Retention}" field="podRetention"
descriptors="${descriptor.allowedPodRetentions}" default="${descriptor.defaultPodRetention}" />
</f:advanced>

<f:entry title="${%Max connections to Kubernetes API}" field="maxRequestsPerHostStr">
<f:number default="32" checkMethod="post"/>
</f:entry>
<f:entry title="${%Max connections to Kubernetes API}" field="maxRequestsPerHostStr">
<f:number default="32" checkMethod="post"/>
</f:entry>

<f:entry title="Seconds to wait for pod to be running" field="waitForPodSec">
<f:number clazz="required number" min="0" step="1" default="${descriptor.defaultWaitForPod}"/>
</f:entry>
<f:entry title="Seconds to wait for pod to be running" field="waitForPodSec">
<f:number clazz="required number" min="0" step="1" default="${descriptor.defaultWaitForPod}"/>
</f:entry>

<f:advanced>
<f:entry title="${%Container Cleanup Timeout (minutes)}" field="retentionTimeout">
<f:number min="${descriptor.defaultRetentionTimeout}" default="${descriptor.defaultRetentionTimeout}" checkMethod="post"/>
</f:entry>
<f:entry title="${%Container Cleanup Timeout (minutes)}" field="retentionTimeout">
<f:number min="${descriptor.defaultRetentionTimeout}" default="${descriptor.defaultRetentionTimeout}" checkMethod="post"/>
</f:entry>

<f:entry title="${%Transfer proxy related environment variables from controller to agent}" field="addMasterProxyEnvVars">
<f:checkbox />
</f:entry>
<f:entry title="${%Transfer proxy related environment variables from controller to agent}" field="addMasterProxyEnvVars">
<f:checkbox />
</f:entry>

<f:entry title="${%Restrict pipeline support to authorized folders}" field="usageRestricted">
<f:checkbox />
</f:entry>
<f:entry title="${%Restrict pipeline support to authorized folders}" field="usageRestricted">
<f:checkbox />
</f:entry>

<f:entry title="${%Defaults Provider Template Name}" field="defaultsProviderTemplate">
<f:textbox default=""/>
</f:entry>
</f:advanced>
</f:advanced>
<f:entry title="${%Defaults Provider Template Name}" field="defaultsProviderTemplate">
<f:textbox default=""/>
</f:entry>

</j:jelly>

0 comments on commit 08850dd

Please sign in to comment.