Skip to content

ITEP-67065 bump Tenant Controller and ASP #348

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

Merged
merged 5 commits into from
May 22, 2025
Merged

ITEP-67065 bump Tenant Controller and ASP #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b743043
ITEP-67065 bump Tenant Controller and ASP
SeanCondon May 21, 2025
5935ac6
clean up codeowners for app-orch
SeanCondon May 21, 2025
94d60c5
fix e2e tests
SeanCondon May 22, 2025
f626a53
fix e2e tests 2
SeanCondon May 22, 2025
4f064e2
fix e2e tests 3
SeanCondon May 22, 2025
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
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
/on-prem-installers/ @se-chris-thach @palade john.oloughlin@intel.com gary.loughnane@intel.com @emmakenny @PalashGoelIntel @mdbalvin @ashridatta @sys-orch-approve

# application catalog tests
/e2e-tests/orchestrator/app_catalog_test.go @scottmbaker @ray-milkey @adibrastegarnia @malruben @SeanCondon @sys-orch-approve
/e2e-tests/orchestrator/catalog_bootstrap_test.go @scottmbaker @ray-milkey @adibrastegarnia @malruben @SeanCondon @sys-orch-approve
/e2e-tests/orchestrator/app_catalog_test.go @scottmbaker @adibrastegarnia @SeanCondon @badhrinathpa @pudelkoM @guptagunjan @sys-orch-approve
/e2e-tests/orchestrator/catalog_bootstrap_test.go @scottmbaker @adibrastegarnia @SeanCondon @badhrinathpa @pudelkoM @guptagunjan @sys-orch-approve

# app orch templates and values
/argocd/applications/templates/app* @scottmbaker @ray-milkey @adibrastegarnia @malruben @SeanCondon @sys-orch-approve
/argocd/applications/configs/app* @scottmbaker @ray-milkey @adibrastegarnia @malruben @SeanCondon @sys-orch-approve
/argocd/applications/custom/app* @scottmbaker @ray-milkey @adibrastegarnia @malruben @SeanCondon @sys-orch-approve
/argocd/applications/templates/app* @scottmbaker @adibrastegarnia @SeanCondon @badhrinathpa @pudelkoM @guptagunjan @sys-orch-approve
/argocd/applications/configs/app* @scottmbaker @adibrastegarnia @SeanCondon @badhrinathpa @pudelkoM @guptagunjan @sys-orch-approve
/argocd/applications/custom/app* @scottmbaker @adibrastegarnia @SeanCondon @badhrinathpa @pudelkoM @guptagunjan @sys-orch-approve

# UI templates and values
/argocd/applications/**/web-ui* @teone @fjcooper5 @satya-in @mamanzan @RPG-coder-intc @dlemiech @riyaz-ghati @vigneshintel
Expand Down
2 changes: 1 addition & 1 deletion argocd/applications/templates/app-orch-tenant-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
sources:
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: app/charts/{{$appName}}
targetRevision: 0.3.5
targetRevision: 0.3.8
helm:
releaseName: {{$appName}}
valuesObject:
Expand Down
2 changes: 1 addition & 1 deletion argocd/applications/templates/app-service-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
sources:
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: app/charts/{{$appName}}
targetRevision: 1.4.2
targetRevision: 1.4.3
helm:
releaseName: {{$appName}}
valuesObject:
Expand Down
15 changes: 9 additions & 6 deletions e2e-tests/orchestrator/catalog_bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,14 @@ func checkLoginCredentials(ctx context.Context, reg Registry, harborProjectName
tlsConfiguration := &tls.Config{ //nolint: gosec
RootCAs: caPool,
}
baseRegistryURL := reg.RootURL + "api/v2.0/"
baseRegistryURL := strings.Replace(reg.RootURL, "oci://", "https://", 1)
baseRegistryURL = strings.ToLower(baseRegistryURL)
baseRegistryURL = strings.TrimSuffix(baseRegistryURL, harborProjectName) + "api/v2.0/"
resp := doHarborREST(ctx, tlsConfiguration, "GET", baseRegistryURL+"projects?name="+harborProjectName, reg.Username, reg.AuthToken, http.StatusOK, checkRESTResponse)
b, err := io.ReadAll(resp.Body)
Expect(err).ToNot(HaveOccurred())
defer resp.Body.Close()
Expect(b).To(ContainSubstring(harborProjectName), "expecting project name %s to be found in query", harborProjectName)
Expect(string(b)).To(ContainSubstring(harborProjectName), "expecting project name %s to be found in query", harborProjectName)
}
}

Expand Down Expand Up @@ -171,7 +173,7 @@ var _ = Describe("Config Provisioner integration test", Label("orchestrator-inte

harborDockerOCIReg := GetRegistry(ctx, c, accessToken, testProject, "harbor-docker-oci", http.StatusOK, checkRESTResponse)
checkRegistry(harborDockerOCIReg, "harbor oci docker", "Harbor OCI docker images registry", "IMAGE",
"https://registry-oci."+serviceDomain+"/")
"oci://registry-oci."+serviceDomain+"/"+harborProjectName)
checkLoginCredentials(ctx, harborDockerOCIReg, harborProjectName)

intelRSHelmReg := GetRegistry(ctx, c, accessToken, testProject, "intel-rs-helm", http.StatusOK, checkRESTResponse)
Expand Down Expand Up @@ -318,8 +320,8 @@ var _ = Describe("Provisioned registries push test", Label("orchestrator-integra
imageName := "docker-push-test-image"
imageVer := "latest"

regDomain := reg.RootURL[strings.LastIndex(reg.RootURL, "//")+2:]
remoteImageName := fmt.Sprintf("%s/%s/%s:%s", strings.TrimRight(regDomain, "/"), harborProjectName, imageName, imageVer)
regDomain := strings.ToLower(reg.RootURL[strings.LastIndex(reg.RootURL, "//")+2:])
remoteImageName := fmt.Sprintf("%s/%s:%s", strings.TrimRight(regDomain, "/"), imageName, imageVer)

err = dc.ImageTag(ctx, imageName+":"+imageVer, remoteImageName)
Expect(err).ToNot(HaveOccurred(), "tagging docker image %s as %s", imageName+":"+imageVer, remoteImageName)
Expand Down Expand Up @@ -347,7 +349,8 @@ var _ = Describe("Provisioned registries push test", Label("orchestrator-integra
tlsConfiguration := &tls.Config{ //nolint: gosec
RootCAs: caPool,
}
baseRegistryURL := reg.RootURL + "api/v2.0/"
baseRegistryURL := strings.TrimSuffix(
strings.Replace(reg.RootURL, "oci://", "https://", 1), harborProjectName) + "api/v2.0/"
doHarborREST(ctx, tlsConfiguration, "GET", baseRegistryURL+"projects/"+harborProjectName+
"/repositories?q=name%3D"+harborProjectName+"%2F"+imageName,
reg.Username, reg.AuthToken, http.StatusOK, checkRESTResponse)
Expand Down
Loading