feat: Merge applicationset into argocd (argoproj#8864)

feat: Merge applicationset into argocd (argoproj#8864) Signed-off-by: rishabh625 <[email protected]> Co-authored-by: jannfis <[email protected]>
rochaporto · Mar 29, 2022 · c77cf66 · c77cf66
1 parent 8847a31
commit c77cf66
Show file tree

Hide file tree

Showing 104 changed files with 23,265 additions and 14,424 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -407,11 +407,12 @@ jobs:
  # port 8080 which is not visible in netstat -tulpen, but still there
  # with a HTTP listener. We have API server listening on port 8088
  # instead.
+ make controller repo-server server applicationset-controller
  make start-e2e-local 2>&1 | sed -r "s/[[:cntrl:]]\[[0-9]{1,3}m//g" > /tmp/e2e-server.log &
  count=1
  until curl -f http://127.0.0.1:8088/healthz; do
  sleep 10;
- if test $count -ge 120; then
+ if test $count -ge 180; then
  echo "Timeout"
  exit 1
  fi
@@ -426,4 +427,4 @@ jobs:
  with:
  name: e2e-server-k8s${{ matrix.k3s-version }}.log
  path: /tmp/e2e-server.log
- if: ${{ failure() }}
+ if: ${{ failure() }}
diff --git a/Dockerfile b/Dockerfile
@@ -128,5 +128,6 @@ RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-cmp-server
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-application-controller
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-dex
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-notifications
+RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-applicationset-controller
 
 USER 999
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -10,4 +10,6 @@ RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-repo-server
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-application-controller
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-dex
 RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-notifications
+RUN ln -s /usr/local/bin/argocd /usr/local/bin/argocd-applicationset-controller
+
 USER 999
diff --git a/Makefile b/Makefile
@@ -421,6 +421,7 @@ start-e2e-local: mod-vendor-local dep-ui-local
  kubectl create ns argocd-e2e || true
  kubectl config set-context --current --namespace=argocd-e2e
  kustomize build test/manifests/base | kubectl apply -f -
+ kubectl apply -f https://raw.githubusercontent.com/open-cluster-management/api/a6845f2ebcb186ec26b832f60c988537a58f3859/cluster/v1alpha1/0000_04_clusters.open-cluster-management.io_placementdecisions.crd.yaml
  # Create GPG keys and source directories
  if test -d /tmp/argo-e2e/app/config/gpg; then rm -rf /tmp/argo-e2e/app/config/gpg/*; fi
  mkdir -p /tmp/argo-e2e/app/config/gpg/keys && chmod 0700 /tmp/argo-e2e/app/config/gpg/keys
@@ -557,3 +558,7 @@ start-test-k8s:
 .PHONY: list
 list:
  @LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
+
+.PHONY: applicationset-controller
+applicationset-controller:
+ CGO_ENABLED=0 go build -v -ldflags '${LDFLAGS}' -o ${DIST_DIR}/argocd-applicationset-controller ./cmd
diff --git a/Procfile b/Procfile
@@ -8,3 +8,4 @@ ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start'
 git-server: test/fixture/testrepos/start-git.sh
 helm-registry: test/fixture/testrepos/start-helm-registry.sh
 dev-mounter: [[ "$ARGOCD_E2E_TEST" != "true" ]] && go run hack/dev-mounter/main.go --configmap argocd-ssh-known-hosts-cm=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} --configmap argocd-tls-certs-cm=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} --configmap argocd-gpg-keys-cm=${ARGOCD_GPG_DATA_PATH:-/tmp/argocd-local/gpg/source}
+applicationset-controller: [ "$BIN_MODE" == 'true' ] && COMMAND=./dist/argocd || COMMAND='go run ./cmd/main.go' && sh -c "FORCE_LOG_COLORS=4 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-applicationset-controller $COMMAND --loglevel debug --metrics-addr localhost:12345 --probe-addr localhost:12346 --argocd-repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081}"