Skip to content
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

Jump to bottom

🌱 kustomize for e2e tests #555

Closed
wants to merge 14 commits into from
Closed

🌱 kustomize for e2e tests #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
642edbd
:seedling: kustomize for e2e tests
khareyash05 Aug 8, 2023
c0d4635
updated images for e2e tests using Kustomize
khareyash05 Aug 9, 2023
e1a6f2b
fix typo for images
khareyash05 Aug 9, 2023
bfbbe2c
updated kustomization.yaml to update images
khareyash05 Aug 9, 2023
3edb974
update new image names for components
khareyash05 Aug 9, 2023
4c25617
update e2e script for kustomize
khareyash05 Aug 9, 2023
4d946ca
update script to add kustomize
khareyash05 Aug 10, 2023
9777a84
Merge branch 'clusterpedia-io:main' into main
khareyash05 Aug 10, 2023
66bae2b
update apiservice metadata name to enable Kustomize to run
khareyash05 Aug 10, 2023
07fbb40
changed namespace
khareyash05 Aug 10, 2023
8ac8b85
add pvc.patch.yaml file
khareyash05 Aug 10, 2023
50bf59e
update helper.sh
khareyash05 Aug 10, 2023
35375ef
update selector to null
khareyash05 Aug 10, 2023
805fb70
add pvc.patch.yaml file
khareyash05 Aug 10, 2023
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
2 changes: 1 addition & 1 deletion kustomize/apiserver/clusterpedia_apiserver_apiservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
name: v1beta1.clusterpedia.io-208003
name: v1beta1.clusterpedia.io
spec:
insecureSkipTLSVerify: true
group: clusterpedia.io
Expand Down
2 changes: 1 addition & 1 deletion kustomize/internalstorage/postgres/clusterpedia_internalstorage_secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
name: internalstorage-password
namespace: clusterpedia-system-0110
namespace: clusterpedia-system
labels:
app: clusterpedia-internalstorage
internalstorage.clusterpedia.io/type: postgres
Expand Down
17 changes: 2 additions & 15 deletions test/helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function create_cluster() {
kind create cluster --name "${name}" --image "docker.io/kindest/node:${version}"
load_image "${name}" localtest/clustersynchro-manager-amd64:test
load_image "${name}" localtest/apiserver-amd64:test
load_image "${name}" localtest/controller-manager-amd64:test
load_image "${name}" docker.io/bitnami/postgresql:11.15.0-debian-10-r14
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clusterpedia/kustomize/internalstorage/postgres/clusterpedia_internalstorage_deployment.yaml

Line 51 in b491fe7

image: postgres:12

load_image "${name}" postgres:12

}

Expand All @@ -65,21 +66,7 @@ function delete_cluster() {

# install the Clusterpedia into the kind cluster
function install_clusterpedia() {
kubectl apply -f "${ROOT}/deploy/crds"
# local charts will be removed, waiting for the kustomize way to be ready
helm repo add bitnami https://charts.bitnami.com/bitnami
helm dependency build "${ROOT}/charts/clusterpedia"
helm install clusterpedia "${ROOT}/charts/clusterpedia" \
--namespace clusterpedia-system \
--create-namespace \
--wait \
--set persistenceMatchNode=None \
--set clustersynchroManager.image.registry=localtest \
--set clustersynchroManager.image.repository=clustersynchro-manager-amd64 \
--set clustersynchroManager.image.tag=test \
--set apiserver.image.registry=localtest \
--set apiserver.image.repository=apiserver-amd64 \
--set apiserver.image.tag=test
kubectl kustomize "${ROOT}/test/kustomize" | kubectl apply -f -
echo kubectl get all -n clusterpedia-system
kubectl get all -n clusterpedia-system
}
Expand Down
19 changes: 19 additions & 0 deletions test/kustomize/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../../kustomize

images:
- name: ghcr.io/clusterpedia-io/clusterpedia/apiserver
newName: localtest/apiserver-amd64
newTag: test
- name: ghcr.io/clusterpedia-io/clusterpedia/clustersynchro-manager
newName: localtest/clustersynchro-manager-amd64
newTag: test
- name: ghcr.io/clusterpedia-io/clusterpedia/controller-manager
newName: localtest/controller-manager-amd64
newTag: test

patches:
- path: pvc.patch.yaml
7 changes: 7 additions & 0 deletions test/kustomize/pvc.patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: internalstorage-postgres
namespace: clusterpedia-system
spec:
selector: null
Loading