Skip to content

Commit 08850dd

Browse files
VlatombeVlatombe
authored
Unwrap advanced configuration section (#1541)
1 parent 9de581f commit 08850dd

File tree

1 file changed

+72
-77
lines changed
  • src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud

1 file changed

+72
-77
lines changed

‎src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/config.jelly

+72-77
Original file line numberDiff line numberDiff line change
@@ -23,106 +23,101 @@ THE SOFTWARE.
2323
<f:entry title="${%Name}" field="name">
2424
<f:textbox default="kubernetes" clazz="required"/>
2525
</f:entry>
26-
27-
<f:advanced title="Kubernetes Cloud details">
2826

29-
<f:entry title="${%Kubernetes URL}" field="serverUrl">
30-
<f:textbox/>
31-
</f:entry>
27+
<f:entry title="${%Kubernetes URL}" field="serverUrl">
28+
<f:textbox/>
29+
</f:entry>
3230

33-
<f:entry title="${%Use Jenkins Proxy}" field="useJenkinsProxy">
34-
<f:checkbox/>
35-
</f:entry>
31+
<f:entry title="${%Use Jenkins Proxy}" field="useJenkinsProxy">
32+
<f:checkbox/>
33+
</f:entry>
3634

37-
<f:entry title="${%Kubernetes server certificate key}" field="serverCertificate">
38-
<f:textarea/>
39-
</f:entry>
35+
<f:entry title="${%Kubernetes server certificate key}" field="serverCertificate">
36+
<f:textarea/>
37+
</f:entry>
4038

41-
<f:entry title="${%Disable https certificate check}" field="skipTlsVerify">
42-
<f:checkbox />
43-
</f:entry>
39+
<f:entry title="${%Disable https certificate check}" field="skipTlsVerify">
40+
<f:checkbox />
41+
</f:entry>
4442

45-
<f:entry title="${%Kubernetes Namespace}" field="namespace">
46-
<f:textbox/>
47-
</f:entry>
43+
<f:entry title="${%Kubernetes Namespace}" field="namespace">
44+
<f:textbox/>
45+
</f:entry>
4846

49-
<f:entry title="${%Agent Docker Registry}" field="jnlpregistry">
50-
<f:textbox/>
51-
</f:entry>
47+
<f:entry title="${%Agent Docker Registry}" field="jnlpregistry">
48+
<f:textbox/>
49+
</f:entry>
5250

53-
<f:entry title="${%Inject restricted PSS security context in agent container definition}" field="restrictedPssSecurityContext">
54-
<f:checkbox/>
55-
</f:entry>
51+
<f:entry title="${%Inject restricted PSS security context in agent container definition}" field="restrictedPssSecurityContext">
52+
<f:checkbox/>
53+
</f:entry>
5654

57-
<f:entry title="${%Credentials}" field="credentialsId">
58-
<c:select/>
59-
</f:entry>
55+
<f:entry title="${%Credentials}" field="credentialsId">
56+
<c:select/>
57+
</f:entry>
6058

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

63-
<f:entry title="${%WebSocket}" field="webSocket">
64-
<f:checkbox/>
65-
</f:entry>
61+
<f:entry title="${%WebSocket}" field="webSocket">
62+
<f:checkbox/>
63+
</f:entry>
6664

67-
<f:entry title="${%Direct Connection}" field="directConnection">
68-
<f:checkbox default="false" />
69-
</f:entry>
65+
<f:entry title="${%Direct Connection}" field="directConnection">
66+
<f:checkbox default="false" />
67+
</f:entry>
7068

71-
<f:entry title="${%Jenkins URL}" field="jenkinsUrl">
72-
<f:textbox />
73-
</f:entry>
69+
<f:entry title="${%Jenkins URL}" field="jenkinsUrl">
70+
<f:textbox />
71+
</f:entry>
7472

75-
<f:entry title="${%Jenkins tunnel}" field="jenkinsTunnel">
76-
<f:textbox />
77-
</f:entry>
73+
<f:entry title="${%Jenkins tunnel}" field="jenkinsTunnel">
74+
<f:textbox />
75+
</f:entry>
7876

79-
<f:entry title="${%Connection Timeout (seconds)}" field="connectTimeout">
80-
<f:number min="${descriptor.defaultConnectTimeout}" default="${descriptor.defaultConnectTimeout}" checkMethod="post"/>
81-
</f:entry>
77+
<f:entry title="${%Connection Timeout (seconds)}" field="connectTimeout">
78+
<f:number min="${descriptor.defaultConnectTimeout}" default="${descriptor.defaultConnectTimeout}" checkMethod="post"/>
79+
</f:entry>
8280

83-
<f:entry title="${%Read Timeout (seconds)}" field="readTimeout">
84-
<f:number min="${descriptor.defaultReadTimeout}" default="${descriptor.defaultReadTimeout}" checkMethod="post"/>
85-
</f:entry>
81+
<f:entry title="${%Read Timeout (seconds)}" field="readTimeout">
82+
<f:number min="${descriptor.defaultReadTimeout}" default="${descriptor.defaultReadTimeout}" checkMethod="post"/>
83+
</f:entry>
8684

87-
<f:entry title="${%Concurrency Limit}" field="containerCapStr">
88-
<f:number default="10"/>
89-
</f:entry>
85+
<f:entry title="${%Concurrency Limit}" field="containerCapStr">
86+
<f:number default="10"/>
87+
</f:entry>
9088

91-
<f:entry title="${%Pod Labels}" field="podLabels">
92-
<f:repeatableHeteroProperty field="podLabels" hasHeader="true" addCaption="${%Add Pod Label}"
93-
deleteCaption="${%Delete Pod Label}" />
94-
</f:entry>
89+
<f:entry title="${%Pod Labels}" field="podLabels">
90+
<f:repeatableHeteroProperty field="podLabels" hasHeader="true" addCaption="${%Add Pod Label}"
91+
deleteCaption="${%Delete Pod Label}" />
92+
</f:entry>
9593

96-
<f:advanced title="${%Pod Retention}">
97-
<f:dropdownDescriptorSelector title="${%Pod Retention}" field="podRetention"
98-
descriptors="${descriptor.allowedPodRetentions}" default="${descriptor.defaultPodRetention}" />
99-
</f:advanced>
94+
<f:advanced title="${%Pod Retention}">
95+
<f:dropdownDescriptorSelector title="${%Pod Retention}" field="podRetention"
96+
descriptors="${descriptor.allowedPodRetentions}" default="${descriptor.defaultPodRetention}" />
97+
</f:advanced>
10098

101-
<f:entry title="${%Max connections to Kubernetes API}" field="maxRequestsPerHostStr">
102-
<f:number default="32" checkMethod="post"/>
103-
</f:entry>
99+
<f:entry title="${%Max connections to Kubernetes API}" field="maxRequestsPerHostStr">
100+
<f:number default="32" checkMethod="post"/>
101+
</f:entry>
104102

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

109-
<f:advanced>
110-
<f:entry title="${%Container Cleanup Timeout (minutes)}" field="retentionTimeout">
111-
<f:number min="${descriptor.defaultRetentionTimeout}" default="${descriptor.defaultRetentionTimeout}" checkMethod="post"/>
112-
</f:entry>
107+
<f:entry title="${%Container Cleanup Timeout (minutes)}" field="retentionTimeout">
108+
<f:number min="${descriptor.defaultRetentionTimeout}" default="${descriptor.defaultRetentionTimeout}" checkMethod="post"/>
109+
</f:entry>
113110

114-
<f:entry title="${%Transfer proxy related environment variables from controller to agent}" field="addMasterProxyEnvVars">
115-
<f:checkbox />
116-
</f:entry>
111+
<f:entry title="${%Transfer proxy related environment variables from controller to agent}" field="addMasterProxyEnvVars">
112+
<f:checkbox />
113+
</f:entry>
117114

118-
<f:entry title="${%Restrict pipeline support to authorized folders}" field="usageRestricted">
119-
<f:checkbox />
120-
</f:entry>
115+
<f:entry title="${%Restrict pipeline support to authorized folders}" field="usageRestricted">
116+
<f:checkbox />
117+
</f:entry>
121118

122-
<f:entry title="${%Defaults Provider Template Name}" field="defaultsProviderTemplate">
123-
<f:textbox default=""/>
124-
</f:entry>
125-
</f:advanced>
126-
</f:advanced>
119+
<f:entry title="${%Defaults Provider Template Name}" field="defaultsProviderTemplate">
120+
<f:textbox default=""/>
121+
</f:entry>
127122

128123
</j:jelly>

0 commit comments

Comments
 (0)