Skip to content

fix: resolve race condition causing false domain-already-taken on app edit #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamesSprow wants to merge 5 commits into
base: release/v3.1.2
Choose a base branch
from
+19 −25
Open

fix: resolve race condition causing false domain-already-taken on app edit #739

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6394be
fix: resolve race condition causing false 'domain already taken' on a…
JamesSprow Apr 12, 2026
e14675a
fix: null-safe guard pipelineData.git.repository and securityContext …
JamesSprow Apr 12, 2026
42c3a76
fix: add async to loadPipelineAndApp then() callback (TS1308)
JamesSprow Apr 12, 2026
5a241cb
fix: run getDomains() after loadPipelineAndApp() to fix domain-alread…
JamesSprow Apr 12, 2026
aaa4d80
fix: guard ingress.tls undefined in setSSL() and sslIndex loop
JamesSprow Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 19 additions & 25 deletions client/src/components/apps/form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1793,8 +1793,10 @@ export default defineComponent({
this.loadPodsizeList(),
this.loadBuildpacks(),
this.loadClusterIssuers(),
this.getDomains(),
]);
// getDomains must run after loadPipelineAndApp (which awaits loadApp) so
// that this.ingress.hosts is populated before whiteListDomains() is called.
await this.getDomains();

if (this.$route.query.template) {
const template = this.$route.query.template as string;
Expand Down Expand Up @@ -1824,14 +1826,8 @@ export default defineComponent({
this.sslIndex.splice(index, 1);
},
whiteListDomains(domainsList: string[]) {
for (let i = 0; i < domainsList.length; i++) {
this.ingress.hosts.forEach((host) => {
if (host.host == domainsList[i]) {
domainsList.splice(i, 1);
}
});
}
return domainsList;
const ownHosts = new Set(this.ingress.hosts.map((h) => h.host));
return domainsList.filter((d) => !ownHosts.has(d));
},
async getDomains() {
return axios.get("/api/kubernetes/domains").then((response) => {
Expand Down Expand Up @@ -1926,7 +1922,7 @@ export default defineComponent({
this.ingress.hosts[0].host = name + "." + this.pipelineData.domain;
},
async loadPipelineAndApp() {
return axios.get("/api/pipelines/" + this.pipeline).then((response) => {
return axios.get("/api/pipelines/" + this.pipeline).then(async (response) => {
this.pipelineData = response.data;

if (this.pipelineData.dockerimage) {
Expand Down Expand Up @@ -2001,7 +1997,7 @@ export default defineComponent({
}

if (this.app != "new") {
this.loadApp();
await this.loadApp();
}
});
},
Expand Down Expand Up @@ -2091,9 +2087,9 @@ export default defineComponent({
console.log(error);
});
},
loadApp() {
async loadApp() {
if (this.app !== "new") {
axios
return axios
.get(`/api/apps/${this.pipeline}/${this.phase}/${this.app}`)
.then((response) => {
this.resourceVersion = response.data.metadata.resourceVersion;
Expand Down Expand Up @@ -2187,7 +2183,7 @@ export default defineComponent({
// iterate over ingress hosts and fill sslIndex
for (let i = 0; i < this.ingress.hosts.length; i++) {
this.sslIndex.push(
this.ingress.tls[0].hosts.includes(this.ingress.hosts[i].host)
this.ingress.tls?.[0]?.hosts.includes(this.ingress.hosts[i].host) ?? false
);
}

Expand All @@ -2200,13 +2196,11 @@ export default defineComponent({
this.buildpack.run.readOnlyAppStorage = true;
}

// remove loaded domain from taken domains
this.takenDomains = this.whiteListDomains(this.takenDomains);
});
}
},
setSSL() {
if (this.ingress.tls?.length == 0) {
if (!this.ingress.tls || this.ingress.tls.length == 0) {
this.ingress.tls = [{ hosts: [], secretName: this.name + "-tls" }];
}
this.ingress.tls[0].hosts = [];
Expand Down Expand Up @@ -2297,11 +2291,11 @@ export default defineComponent({
async updateApp() {
this.loading = true;
try {
if (this.gitrepo.ssh_url == this.pipelineData.git.repository.ssh_url) {
if (this.pipelineData.git?.repository && this.gitrepo.ssh_url == this.pipelineData.git.repository.ssh_url) {
this.gitrepo = this.pipelineData.git.repository;
}

if (this.gitrepo.admin == false) {
if (this.gitrepo.admin == false && this.gitrepo.ssh_url) {
//this.gitrepo.clone_url = this.gitrepo.ssh_url.replace(':', '/').replace('git@', 'https://');
// eslint-disable-next-line no-useless-escape
const regex =
Expand Down Expand Up @@ -2381,12 +2375,12 @@ export default defineComponent({
healthcheck: this.healthcheck,
};

if (typeof postdata.image.run.securityContext.runAsUser === "string") {
if (postdata.image.run?.securityContext && typeof postdata.image.run.securityContext.runAsUser === "string") {
postdata.image.run.securityContext.runAsUser = parseInt(
postdata.image.run.securityContext.runAsUser
);
}
if (typeof postdata.image.run.securityContext.runAsGroup === "string") {
if (postdata.image.run?.securityContext && typeof postdata.image.run.securityContext.runAsGroup === "string") {
postdata.image.run.securityContext.runAsGroup = parseInt(
postdata.image.run.securityContext.runAsGroup
);
Expand Down Expand Up @@ -2417,11 +2411,11 @@ export default defineComponent({
}
}

if (this.gitrepo.ssh_url == this.pipelineData.git.repository.ssh_url) {
if (this.pipelineData.git?.repository && this.gitrepo.ssh_url == this.pipelineData.git.repository.ssh_url) {
this.gitrepo = this.pipelineData.git.repository;
}

if (this.gitrepo.admin == false) {
if (this.gitrepo.admin == false && this.gitrepo.ssh_url) {
// eslint-disable-next-line no-useless-escape
const regex =
/(git@|ssh:|http[s]?:\/\/)([\w.]+)(:|\/)([\w/\-~]+)(\.git)?/;
Expand Down Expand Up @@ -2499,12 +2493,12 @@ export default defineComponent({
postdata.image.run = {} as BuildpackStepConfig;
}

if (typeof postdata.image.run.securityContext.runAsUser === "string") {
if (postdata.image.run?.securityContext && typeof postdata.image.run.securityContext.runAsUser === "string") {
postdata.image.run.securityContext.runAsUser = parseInt(
postdata.image.run.securityContext.runAsUser
);
}
if (typeof postdata.image.run.securityContext.runAsGroup === "string") {
if (postdata.image.run?.securityContext && typeof postdata.image.run.securityContext.runAsGroup === "string") {
postdata.image.run.securityContext.runAsGroup = parseInt(
postdata.image.run.securityContext.runAsGroup
);
Expand Down
Loading