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.

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

update argocd #12

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 argo-cd/deployments/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: fast-api-deployment
namespace: test-ns
spec:
replicas: 1
replicas: 3
selector:
matchLabels:
app: python-app
Expand Down
32 changes: 16 additions & 16 deletions argo-cd/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ echo "You're also going to need the pw - find it using the cli by running \nargo
echo "Or you can find it by decoding the secret \n kubectl get secret argocd-initial-admin-secret -n argocd --template={{.data.password}} | base64 -D"


echo "argo workflows"
kubectl apply -n argo -f https://github.com/argoproj/argo-workflows/releases/download/v3.5.5/install.yaml
kubectl patch deployment \
argo-server \
--namespace argo \
--type='json' \
-p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args", "value": [
"server",
"--auth-mode=server"
]}]'


echo "argo events"
kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/install.yaml
kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/install-validating-webhook.yaml
kubectl apply -n argo-events -f https://raw.githubusercontent.com/argoproj/argo-events/stable/examples/eventbus/native.yaml
# echo "argo workflows"
# kubectl apply -n argo -f https://github.com/argoproj/argo-workflows/releases/download/v3.5.5/install.yaml
# kubectl patch deployment \
# argo-server \
# --namespace argo \
# --type='json' \
# -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args", "value": [
# "server",
# "--auth-mode=server"
# ]}]'


# echo "argo events"
# kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/install.yaml
# kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/install-validating-webhook.yaml
# kubectl apply -n argo-events -f https://raw.githubusercontent.com/argoproj/argo-events/stable/examples/eventbus/native.yaml

8 changes: 3 additions & 5 deletions argo-cd/pr-generator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ spec:
# appSecretName: github-app-repo-creds
# Labels is used to filter the PRs that you want to target. (optional)
labels:
- pr-test
requeueAfterSeconds: 10
- preview
requeueAfterSeconds: 15
template:
metadata:
name: "myapp-{{branch}}-{{number}}"
name: "pr-generated-{{branch}}-{{number}}"
namespace: argocd
spec:
source:
Expand All @@ -46,5 +46,3 @@ spec:
selfHeal: true
syncOptions:
- CreateNamespace=true
- ApplyOutOfSyncOnly=true
- ServerSideApply=true
16 changes: 0 additions & 16 deletions argo-cd/vcluster.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion vclusters/apps/vcluster-generator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cluster_name: ""
cluster_name: "test-cluster-name"
chart_name: "null"
# chart_name: "vcluster-k8s"
chart_repo: "null"
Expand Down
15 changes: 8 additions & 7 deletions vclusters/argocd/pr-applicationset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@ spec:
# key: token
labels:
- pr-test
requeueAfterSeconds: 10
template:
metadata:
name: "pr-demo--{{branch}}--pr-{{number}}"
spec:
source:
repoURL: "https://github.com/philiplee13/k8s-learning.git"
targetRevision: "HEAD"
path: basic-deployments
helm:
parameters:
- name: cluster_name
value: demo-pr-{{number}}
project: vcluster
targetRevision: "{{head_sha}}"
path: vclusters/apps/vcluster-generator
# helm:
# parameters:
# - name: cluster_name
# value: demo-pr-{{number}}
project: default
destination:
name: in-cluster
namespace: vcluster
Expand Down