Skip to content

Hosted demo #1

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.

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
wants to merge 38 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
51f4f78
fixing manifest errors
nightmar39 Jul 22, 2022
5f9526a
Update GITHUB_USER and GITHUB_REPO
nightmar39 Jul 22, 2022
dc406f0
Update GITHUB_USER and GITHUB_REPO
nightmar39 Jul 22, 2022
313c4e4
testing one application without the namespace specified
nightmar39 Jul 22, 2022
02b3e2b
fixing other 2
nightmar39 Jul 22, 2022
e6852aa
adding self heal to see if it makes it do sync automatically
nightmar39 Jul 22, 2022
2aece30
fixing project references
nightmar39 Jul 22, 2022
7a5e301
fixing project references for all
nightmar39 Jul 22, 2022
7c230c4
adding project file to test
nightmar39 Jul 22, 2022
b151a3b
updating project to existing one
nightmar39 Jul 22, 2022
dab74e4
pointing apps to default project
nightmar39 Jul 22, 2022
5e46a2f
adding a project to show error
nightmar39 Jul 22, 2022
83623a6
removing namespace from project for testing
nightmar39 Jul 22, 2022
0131e6d
fixing cluster and pointing to custom project
nightmar39 Jul 22, 2022
23b554f
fixing nginx pod manifest
nightmar39 Jul 22, 2022
8816f80
fixing kustomize manifests
nightmar39 Jul 22, 2022
827b320
actually fixing kustomize errors
nightmar39 Jul 22, 2022
9a1a248
adding other projects
nightmar39 Jul 22, 2022
bbe03de
updating projects and apps
nightmar39 Jul 22, 2022
f54994d
deleting projects, adding to git-sources proj
nightmar39 Jul 22, 2022
a79cb79
removed projects
nightmar39 Jul 22, 2022
524b30a
updating manifests to update apps
nightmar39 Jul 22, 2022
652e5ad
testing different project names
nightmar39 Jul 22, 2022
97ed260
all apps using default project
nightmar39 Jul 22, 2022
86ea303
Update GITHUB_USER and GITHUB_REPO
nightmar39 Jul 27, 2022
6c78ac7
Merge pull request #1 from nightmar39/hosted-demo
nightmar39 Jul 27, 2022
c95351c
Update values.yaml
nightmar39 Jul 28, 2022
11fe2ed
Update values.yaml
nightmar39 Jul 28, 2022
734c418
Update values.yaml
nightmar39 Jul 28, 2022
7a79127
Update values.yaml
nightmar39 Jul 29, 2022
194a8be
Update values.yaml
nightmar39 Jul 29, 2022
2d31fc6
Update values.yaml
nightmar39 Jul 29, 2022
1f1c077
Update values.yaml
nightmar39 Jul 29, 2022
f255025
testing a push to a different folder
nightmar39 Jul 29, 2022
f70e3a5
Update values.yaml
nightmar39 Jul 29, 2022
7996eea
Update values.yaml
nightmar39 Jul 29, 2022
c038b12
Update values.yaml
nightmar39 Jul 29, 2022
7ebb726
Update values.yaml
nightmar39 Jul 29, 2022
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
8 changes: 4 additions & 4 deletions argocd-definitions/dev/app.express.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: express-dev
namespace: codefresh
labels:
app: express-dev
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: express-dev
name: CLUSTER_NAME
project: express
name: docker-ngrok
project: default
source:
path: ./k8s-resources/express/overlays/dev
repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
repoURL: https://github.com/nightmar39/cd-five-mins.git
targetRevision: main
syncPolicy:
syncOptions:
- CreateNamespace=true
automated:
prune: true
selfHeal: true
7 changes: 3 additions & 4 deletions argocd-definitions/dev/app.nginx-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: nginx-pod-dev
namespace: codefresh
labels:
app: nginx-pod-dev
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
project: default
destination:
namespace: nginx-pod-dev
name: CLUSTER_NAME
project: nginx-pod
name: docker-ngrok
source:
repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
repoURL: https://github.com/nightmar39/cd-five-mins.git
targetRevision: main
path: ./k8s-resources/nginx-pod/dev
syncPolicy:
Expand Down
7 changes: 3 additions & 4 deletions argocd-definitions/dev/app.trio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: trio-dev
namespace: codefresh
labels:
app: trio-dev
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
project: default
destination:
namespace: trio-dev
name: CLUSTER_NAME
project: trio
name: docker-ngrok
source:
repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
repoURL: https://github.com/nightmar39/cd-five-mins.git
targetRevision: main
path: ./k8s-resources/trio/dev
helm:
Expand Down
29 changes: 0 additions & 29 deletions argocd-definitions/dev/project.express.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions argocd-definitions/dev/project.nginx-pod.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions argocd-definitions/dev/project.trio.yaml

This file was deleted.

5 changes: 2 additions & 3 deletions k8s-resources/express/base/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
apiVersion: argoproj.io/v1alpha1
apiVersion: apps/v1
kind: Deployment
metadata:
name: express-microservice
namespace: codefresh
spec:
replicas: 4
replicas: 3
# revisionHistoryLimit>2 not supported right now
revisionHistoryLimit: 2
selector:
Expand Down
1 change: 0 additions & 1 deletion k8s-resources/express/base/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: express-active
namespace: codefresh
spec:
ports:
- port: 80
Expand Down
3 changes: 3 additions & 0 deletions k8s-resources/express/overlays/dev/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ resources:
images:
- name: quay.io/codefresh_sa/express
newTag: "5416e81"
replicas:
- name: express-microservice
count: 2
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
apiVersion: v1
kind: Pod
metadata:
name: webserver
namespace: codefresh
name: webserver-nginx
spec:
containers:
- name: webserver
- name: webserver-nginx
image: nginx:latest
ports:
- containerPort: 80
4 changes: 2 additions & 2 deletions k8s-resources/trio/dev/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ buslog:
repository: quay.io/codefresh_sa/buslog
tag: "4ed1e59"
ctrlr:
replicaCount: 2
replicaCount: 1
image:
repository: quay.io/codefresh_sa/ctrlr
tag: "2b6d88e"
flask-ui:
replicaCount: 3
replicaCount: 2
image:
repository: quay.io/codefresh_sa/flask-ui
tag: "1b8d478"
25 changes: 25 additions & 0 deletions push/update-git-info-linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
echo "Enter git user name"

read GIT_USER

echo "Enter git repo name"

read GIT_REPO

echo "Enter Managed Cluster name"

read MANAGED_CLUSTER

for i in ../argocd-definitions/dev/app*; do
sed -i -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i
done

git add ./argocd-definitions/dev/app*

git branch -M hosted-demo

git commit -m "Update GITHUB_USER, GITHUB_REPO and CLUSTER_NAME"

git push -u origin hosted-demo

25 changes: 25 additions & 0 deletions push/update-git-info-mac.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
echo "Enter git user name"

read GIT_USER

echo "Enter git repo name"

read GIT_REPO

echo "Enter the name of your managed cluster"

read MANAGED_CLUSTER

for i in ./argocd-definitions/dev/app*; do
sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i
done

git add ./argocd-definitions/dev/app*

git branch -M hosted-demo

git commit -m "Update GITHUB_USER and GITHUB_REPO"

git push -u origin hosted-demo