Skip to content

Commit 295e721

Browse files
committed
fix Certmanager annotations
1 parent 2190d57 commit 295e721

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

client/src/components/accounts/roles.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
:disabled="!writeUserPermission"
169169
>
170170
<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>
172172
</v-btn>
173173
</div>
174174

@@ -279,7 +279,7 @@
279279
<!-- Dialog for a new Role -->
280280
<v-dialog v-model="createDialog" max-width="500px">
281281
<v-card>
282-
<v-card-title>Create Role</v-card-title>
282+
<v-card-title>{{ $t('roles.actions.create') }}</v-card-title>
283283
<v-card-text>
284284
<v-text-field v-model="newRole.name" label="Role Name"></v-text-field>
285285
<v-text-field v-model="newRole.description" label="Descrioption"></v-text-field>

client/src/components/apps/form.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,7 +2203,7 @@ export default defineComponent({
22032203
},
22042204
cleanupIngressAnnotations(){
22052205
2206-
if (this.ingress.tls?.length == 0) {
2206+
if (this.ingress.tls[0].hosts.length == 0) {
22072207
delete this.ingress.annotations['cert-manager.io/cluster-issuer'];
22082208
delete this.ingress.annotations['kubernetes.io/tls-acme'];
22092209
} else {
@@ -2251,8 +2251,8 @@ export default defineComponent({
22512251
this.gitrepo.clone_url = this.gitrepo.ssh_url.replace(regex, "https://$2/$4$5");
22522252
}
22532253
2254-
this.cleanupIngressAnnotations();
22552254
this.setSSL();
2255+
this.cleanupIngressAnnotations();
22562256
22572257
let command = [] as string[];
22582258
if (this.docker.command.length > 0) {
@@ -2361,8 +2361,8 @@ export default defineComponent({
23612361
this.docker.tag = "v1"
23622362
}
23632363
2364-
this.cleanupIngressAnnotations();
23652364
this.setSSL();
2365+
this.cleanupIngressAnnotations();
23662366
23672367
let postdata = {
23682368
pipeline: this.pipeline,
@@ -2415,7 +2415,7 @@ export default defineComponent({
24152415
cronjobs: this.cronjobFormat(this.cronjobs),
24162416
addons: this.addons,
24172417
security: this.security,
2418-
ingress: this.ingress,
2418+
ingress: this.ingress,
24192419
vulnerabilityscan: this.vulnerabilityscan,
24202420
healthcheck: this.healthcheck,
24212421
}

server/src/config/config.service.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ export class ConfigService {
197197
'KUBERO_TEMPLATES_ENABLED',
198198
config.templates?.enabled ? 'true' : 'false',
199199
);
200+
this.setEnvVar(
201+
'KUBERO_CLUSTER_ISSUER',
202+
config.clusterissuer || 'letsencrypt-prod',
203+
);
200204
}
201205

202206
private reloadRunningConfig(): void {
@@ -623,14 +627,9 @@ export class ConfigService {
623627

624628

625629
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-
}
631630
return {
632631
clusterissuer:
633-
kuberoes.spec.kubero.config.clusterissuer || 'not-configured',
632+
process.env.KUBERO_CLUSTER_ISSUER || 'letsencrypt-prod',
634633
};
635634
}
636635

0 commit comments

Comments
 (0)