File tree Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 168
168
:disabled =" !writeUserPermission"
169
169
>
170
170
<v-icon >mdi-plus</v-icon >
171
- <span class =" sr-only" >{{ $t('roles.actions.edit ') }}</span >
171
+ <span class =" sr-only" >{{ $t('roles.actions.create ') }}</span >
172
172
</v-btn >
173
173
</div >
174
174
279
279
<!-- Dialog for a new Role -->
280
280
<v-dialog v-model =" createDialog" max-width =" 500px" >
281
281
<v-card >
282
- <v-card-title >Create Role </v-card-title >
282
+ <v-card-title >{{ $t('roles.actions.create') }} </v-card-title >
283
283
<v-card-text >
284
284
<v-text-field v-model =" newRole.name" label =" Role Name" ></v-text-field >
285
285
<v-text-field v-model =" newRole.description" label =" Descrioption" ></v-text-field >
Original file line number Diff line number Diff line change @@ -2203,7 +2203,7 @@ export default defineComponent({
2203
2203
},
2204
2204
cleanupIngressAnnotations(){
2205
2205
2206
- if (this .ingress .tls ? .length == 0 ) {
2206
+ if (this .ingress .tls [ 0 ]. hosts .length == 0 ) {
2207
2207
delete this .ingress .annotations [' cert-manager.io/cluster-issuer' ];
2208
2208
delete this .ingress .annotations [' kubernetes.io/tls-acme' ];
2209
2209
} else {
@@ -2251,8 +2251,8 @@ export default defineComponent({
2251
2251
this .gitrepo .clone_url = this .gitrepo .ssh_url .replace (regex , " https://$2/$4$5" );
2252
2252
}
2253
2253
2254
- this .cleanupIngressAnnotations ();
2255
2254
this .setSSL ();
2255
+ this .cleanupIngressAnnotations ();
2256
2256
2257
2257
let command = [] as string [];
2258
2258
if (this .docker .command .length > 0 ) {
@@ -2361,8 +2361,8 @@ export default defineComponent({
2361
2361
this .docker .tag = " v1"
2362
2362
}
2363
2363
2364
- this .cleanupIngressAnnotations ();
2365
2364
this .setSSL ();
2365
+ this .cleanupIngressAnnotations ();
2366
2366
2367
2367
let postdata = {
2368
2368
pipeline: this .pipeline ,
@@ -2415,7 +2415,7 @@ export default defineComponent({
2415
2415
cronjobs: this .cronjobFormat (this .cronjobs ),
2416
2416
addons: this .addons ,
2417
2417
security: this .security ,
2418
- ingress: this .ingress ,
2418
+ ingress: this .ingress ,
2419
2419
vulnerabilityscan: this .vulnerabilityscan ,
2420
2420
healthcheck: this .healthcheck ,
2421
2421
}
Original file line number Diff line number Diff line change @@ -197,6 +197,10 @@ export class ConfigService {
197
197
'KUBERO_TEMPLATES_ENABLED' ,
198
198
config . templates ?. enabled ? 'true' : 'false' ,
199
199
) ;
200
+ this . setEnvVar (
201
+ 'KUBERO_CLUSTER_ISSUER' ,
202
+ config . clusterissuer || 'letsencrypt-prod' ,
203
+ ) ;
200
204
}
201
205
202
206
private reloadRunningConfig ( ) : void {
@@ -623,14 +627,9 @@ export class ConfigService {
623
627
624
628
625
629
public async getClusterIssuer ( ) : Promise < { clusterissuer : string } > {
626
- const namespace = process . env . KUBERO_NAMESPACE || 'kubero' ;
627
- const kuberoes = await this . kubectl . getKuberoConfig ( namespace ) ;
628
- if ( kuberoes == undefined ) {
629
- return { clusterissuer : 'not-configured' } ;
630
- }
631
630
return {
632
631
clusterissuer :
633
- kuberoes . spec . kubero . config . clusterissuer || 'not-configured ' ,
632
+ process . env . KUBERO_CLUSTER_ISSUER || 'letsencrypt-prod ' ,
634
633
} ;
635
634
}
636
635
You can’t perform that action at this time.
0 commit comments