Move kustomization files back to kustomize 2.0.3 (#1972)

* Move kustomization files back to kustomize 2.0.3 * Dockerize codegen
2026-02-20 01:28:45 +01:00 · 2019-07-23 11:24:59 -07:00
parent 57e2c5d7e7
commit 6956dcb6dc
14 changed files with 222 additions and 252 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,6 @@ commands:
      - install_tools
      - clean_checkout
      - configure_git
-      - install_go_deps
      - dep_ensure
  configure_git:
    steps:
@@ -26,13 +25,6 @@ commands:
          name: Remove checked out code
          command: rm -Rf /home/circleci/.go_workspace/src/github.com/argoproj/argo-cd
      - checkout
-  install_go_deps:
-    steps:
-      - run:
-          name: Install Go deps
-          command: |
-            set -x
-            make install-dev-tools
  dep_ensure:
    steps:
      - restore_cache:
@@ -72,14 +64,6 @@ commands:
            - dl-v5
            - dl-v4
            - dl-v3
-      - run:
-          name: Install JQ v1.6
-          command: |
-            set -x
-            [ -e /tmp/dl/jq ] || curl -sLf -C - -o /tmp/dl/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
-            sudo cp /tmp/dl/jq /usr/local/bin/jq
-            sudo chmod +x /usr/local/bin/jq
-            jq --version
      - run:
          name: Install Kubectx v0.6.3
          command: |
@@ -99,14 +83,6 @@ commands:
            sudo cp /tmp/dl/dep /usr/local/go/bin/dep
            sudo chmod +x /usr/local/go/bin/dep
            dep version
-      - run:
-          name: Install Go Swagger v0.19.0
-          command: |
-            set -x
-            [ -e /tmp/dl/swagger ] || curl -sLf -C - -o /tmp/dl/swagger https://github.com/go-swagger/go-swagger/releases/download/v0.19.0/swagger_linux_amd64
-            sudo cp /tmp/dl/swagger /usr/local/bin/swagger
-            sudo chmod +x /usr/local/bin/swagger
-            swagger version
      - run:
          name: Install Ksonnet v0.13.1
          command: |
@@ -142,15 +118,6 @@ commands:
            sudo cp /tmp/dl/kustomize_${VER} /usr/local/go/bin/kustomize
            sudo chmod +x /usr/local/go/bin/kustomize
            kustomize version
-      - run:
-          name: Install Protobuf compiler v3.7.1
-          command: |
-            set -x
-            [ -e /tmp/dl/protoc.zip ] || curl -sLf -C - -o /tmp/dl/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip
-            sudo unzip /tmp/dl/protoc.zip bin/protoc -d /usr/local/
-            sudo chmod +x /usr/local/bin/protoc
-            sudo unzip /tmp/dl/protoc.zip include/* -d /usr/local/
-            protoc --version
      - run:
          name: Install Git LFS plugin
          command: |
--- a/25
+++ b/25
@@ -23,24 +23,11 @@ RUN apt-get update && apt-get install -y \

 WORKDIR /tmp

-# Install docker
-ENV DOCKER_CHANNEL stable
-ENV DOCKER_VERSION 18.09.1
-RUN wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" && \
-    tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ && \
-    rm docker.tgz
-
 # Install dep
 ENV DEP_VERSION=0.5.0
 RUN wget https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -O /usr/local/bin/dep && \
    chmod +x /usr/local/bin/dep

-# Install gometalinter
-ENV GOMETALINTER_VERSION=2.0.12
-RUN curl -sLo- https://github.com/alecthomas/gometalinter/releases/download/v${GOMETALINTER_VERSION}/gometalinter-${GOMETALINTER_VERSION}-linux-amd64.tar.gz | \
-    tar -xzC "$GOPATH/bin" --exclude COPYING --exclude README.md --strip-components 1 -f- && \
-    ln -s $GOPATH/bin/gometalinter $GOPATH/bin/gometalinter.v2
-
 # Install packr
 ENV PACKR_VERSION=1.21.9
 RUN wget https://github.com/gobuffalo/packr/releases/download/v${PACKR_VERSION}/packr_${PACKR_VERSION}_linux_amd64.tar.gz && \
@@ -85,18 +72,6 @@ ENV AWS_IAM_AUTHENTICATOR_VERSION=0.4.0-alpha.1
 RUN curl -L -o /usr/local/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/${AWS_IAM_AUTHENTICATOR_VERSION}/aws-iam-authenticator_${AWS_IAM_AUTHENTICATOR_VERSION}_linux_amd64 && \
    chmod +x /usr/local/bin/aws-iam-authenticator

-# Install golangci-lint
-RUN wget https://install.goreleaser.com/github.com/golangci/golangci-lint.sh  && \
-    chmod +x ./golangci-lint.sh && \
-    ./golangci-lint.sh -b $GOPATH/bin && \
-    golangci-lint linters
-
-COPY .golangci.yml ${GOPATH}/src/dummy/.golangci.yml
-
-RUN cd ${GOPATH}/src/dummy && \
-    touch dummy.go \
-    golangci-lint run
-
 ####################################################################################################
 # Argo CD Base - used as the base for both the release and dev argocd images
 ####################################################################################################
--- a/25
+++ b/25
@@ -65,23 +65,12 @@ openapigen:
 clientgen:
 	./hack/update-codegen.sh

-.PHONY: codegen
-codegen: protogen clientgen openapigen manifests
+.PHONY: codegen-local
+codegen-local: protogen clientgen openapigen manifests

-.PHONY: install-dev-tools
-install-dev-tools:
-	cd ./hack && \
-	GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-alpha.2 && \
-	GO111MODULE=on go get github.com/gobuffalo/packr/packr@v1.30.1 && \
-	GO111MODULE=on go get github.com/gogo/protobuf/gogoproto@v1.2.1 && \
-	GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.2 && \
-	GO111MODULE=on go get github.com/golang/protobuf/protoc-gen-go@v1.3.1 && \
-	GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1 && \
-	GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v1.9.2 && \
-	GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v1.9.2 && \
-	GO111MODULE=on go get github.com/jstemmer/go-junit-report@v0.0.0-20190106144839-af01ea7f8024 && \
-	GO111MODULE=on go get github.com/mattn/goreman@v0.2.1 && \
-	GO111MODULE=on go get golang.org/x/tools/cmd/goimports@v0.0.0-20190627203933-19ff4fff8850
+.PHONY: codegen
+codegen: dev-tools-image
+	docker run --rm -it -v ${CURRENT_DIR}:/go/src/github.com/argoproj/argo-cd -w /go/src/github.com/argoproj/argo-cd argocd-dev-tools bash -c "GOPATH=/go make codegen-local"

 .PHONY: cli
 cli: clean-debug
@@ -99,6 +88,10 @@ argocd-util: clean-debug
 	# Build argocd-util as a statically linked binary, so it could run within the alpine-based dex container (argoproj/argo-cd#844)
 	CGO_ENABLED=0 go build -v -i -ldflags '${LDFLAGS}' -o ${DIST_DIR}/argocd-util ./cmd/argocd-util

+.PHONY: dev-tools-image
+dev-tools-image:
+	docker build -t argocd-dev-tools ./hack -f ./hack/Dockerfile.dev-tools
+
 .PHONY: manifests
 manifests:
 	./hack/update-manifests.sh
--- a/assets/swagger.json
+++ b/assets/swagger.json
@@ -49,7 +49,7 @@
          "ApplicationService"
        ],
        "summary": "List returns list of applications",
-        "operationId": "ListMixin1",
+        "operationId": "ListMixin6",
        "parameters": [
          {
            "type": "string",
@@ -89,7 +89,7 @@
          "ApplicationService"
        ],
        "summary": "Create creates an application",
-        "operationId": "CreateMixin1",
+        "operationId": "CreateMixin6",
        "parameters": [
          {
            "name": "body",
@@ -116,7 +116,7 @@
          "ApplicationService"
        ],
        "summary": "Update updates an application",
-        "operationId": "UpdateMixin1",
+        "operationId": "UpdateMixin6",
        "parameters": [
          {
            "type": "string",
@@ -197,7 +197,7 @@
          "ApplicationService"
        ],
        "summary": "Get returns an application by name",
-        "operationId": "Get",
+        "operationId": "GetMixin6",
        "parameters": [
          {
            "type": "string",
@@ -238,7 +238,7 @@
          "ApplicationService"
        ],
        "summary": "Delete deletes an application",
-        "operationId": "DeleteMixin1",
+        "operationId": "DeleteMixin6",
        "parameters": [
          {
            "type": "string",
@@ -852,7 +852,7 @@
          "ClusterService"
        ],
        "summary": "List returns list of clusters",
-        "operationId": "ListMixin3",
+        "operationId": "List",
        "parameters": [
          {
            "type": "string",
@@ -874,7 +874,7 @@
          "ClusterService"
        ],
        "summary": "Create creates a cluster",
-        "operationId": "CreateMixin3",
+        "operationId": "Create",
        "parameters": [
          {
            "name": "body",
@@ -901,7 +901,7 @@
          "ClusterService"
        ],
        "summary": "Update updates a cluster",
-        "operationId": "UpdateMixin3",
+        "operationId": "Update",
        "parameters": [
          {
            "type": "string",
@@ -934,7 +934,7 @@
          "ClusterService"
        ],
        "summary": "Get returns a cluster by server address",
-        "operationId": "GetMixin3",
+        "operationId": "GetMixin1",
        "parameters": [
          {
            "type": "string",
@@ -957,7 +957,7 @@
          "ClusterService"
        ],
        "summary": "Delete deletes a cluster",
-        "operationId": "DeleteMixin3",
+        "operationId": "Delete",
        "parameters": [
          {
            "type": "string",
@@ -1239,7 +1239,7 @@
          "RepositoryService"
        ],
        "summary": "List returns list of repos",
-        "operationId": "List",
+        "operationId": "ListMixin2",
        "parameters": [
          {
            "type": "string",
@@ -1261,7 +1261,7 @@
          "RepositoryService"
        ],
        "summary": "Create creates a repo",
-        "operationId": "Create",
+        "operationId": "CreateMixin2",
        "parameters": [
          {
            "name": "body",
@@ -1288,7 +1288,7 @@
          "RepositoryService"
        ],
        "summary": "Update updates a repo",
-        "operationId": "Update",
+        "operationId": "UpdateMixin2",
        "parameters": [
          {
            "type": "string",
@@ -1321,7 +1321,7 @@
          "RepositoryService"
        ],
        "summary": "Delete deletes a repo",
-        "operationId": "Delete",
+        "operationId": "DeleteMixin2",
        "parameters": [
          {
            "type": "string",
@@ -1500,7 +1500,7 @@
          "SettingsService"
        ],
        "summary": "Get returns Argo CD settings",
-        "operationId": "GetMixin5",
+        "operationId": "Get",
        "responses": {
          "200": {
            "description": "(empty)",
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -13,36 +13,21 @@ Install:
 * [git](https://git-scm.com/) and [git-lfs](https://git-lfs.github.com/)
 * [golang](https://golang.org/)
 * [dep](https://github.com/golang/dep)
-* [protobuf](https://developers.google.com/protocol-buffers/)
 * [ksonnet](https://github.com/ksonnet/ksonnet#install)
 * [helm](https://github.com/helm/helm/releases)
 * [kustomize](https://github.com/kubernetes-sigs/kustomize/releases)
-* [go-swagger](https://github.com/go-swagger/go-swagger/blob/master/docs/install.md)
-* [jq](https://stedolan.github.io/jq/)
 * [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 * [kubectx](https://kubectx.dev)
 * [minikube](https://kubernetes.io/docs/setup/minikube/) or Docker for Desktop

-!!! warning "Versions"
-    You will find problems generating code if you do not have the correct versions of `protoc` and `swagger`
-    
-```bash
-$ protoc --version
-libprotoc 3.7.1
-~/go/src/github.com/argoproj/argo-cd (ui)
-$ swagger version
-version: v0.19.0
-```
-
 Brew users can quickly install the lot:
    
 ```bash
-brew tap go-swagger/go-swagger
-brew install git-lfs go dep protobuf kubectl kubectx ksonnet/tap/ks kubernetes-helm jq go-swagger kustomize 
+brew install git-lfs go dep kubectl kubectx ksonnet/tap/ks kubernetes-helm kustomize 
 ```

 !!! note "Kustomize"
-    Since Argo CD supports Kustomize v1.0 and v2.0, you will need to install both versions in order for the unit tests to run. The Kustomize 1 unit test expects to find a `kustomize1` binary in the path.  You can use this [link](https://github.com/argoproj/argo-cd/blob/master/Dockerfile#L66-L69) to find the Kustomize 1 currently used by Argo CD and modify the curl command to download the correct OS.
+    Since Argo CD supports Kustomize v1.0 and v3.0, you will need to install both versions in order for the unit tests to run. The Kustomize 1 unit test expects to find a `kustomize1` binary in the path.  You can use this [link](https://github.com/argoproj/argo-cd/blob/master/Dockerfile#L66-L69) to find the Kustomize 1 currently used by Argo CD and modify the curl command to download the correct OS.

 Set up environment variables (e.g. is `~/.bashrc`):

@@ -58,12 +43,6 @@ go get -u github.com/argoproj/argo-cd
 cd ~/go/src/github.com/argoproj/argo-cd
 ```

-Install go dependencies:
-
-```bash
-make install-dev-tools
-```
-
 ## Building

 Ensure dependencies are up to date first:
@@ -80,7 +59,11 @@ make

 The make command can take a while, and we recommend building the specific component you are working on

-* `make codegen` - Builds protobuf and swagger files
+* `make codegen` - Builds protobuf and swagger files.
+
+Note: `make codegen` is slow because it uses docker + volume mounts. To improve performance you might install binaries from `./hack/Dockerfile.dev-tools`
+and use `make codegen-local`. It is still recommended to run `make codegen` once before sending PR to make sure correct version of codegen tools is used.   
+
 * `make cli` - Make the argocd CLI tool
 * `make server` - Make the API/repo/controller server
 * `make argocd-util` - Make the administrator's utility, used for certain tasks such as import/export
--- a/hack/.dockerignore
+++ b/hack/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.dev-tools
--- a/hack/Dockerfile.dev-tools
+++ b/hack/Dockerfile.dev-tools
@@ -0,0 +1,57 @@
+FROM golang:1.12.6 as builder
+
+ENV KUSTOMIZE_VERSION=2.0.3
+RUN curl -L -o /usr/local/bin/kustomize https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64 && \
+    chmod +x /usr/local/bin/kustomize && \
+    kustomize version
+
+ADD . /src
+
+WORKDIR /src
+
+RUN GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-alpha.2 && \
+    GO111MODULE=on go get github.com/gobuffalo/packr/packr@v1.30.1 && \
+    GO111MODULE=on go get github.com/gogo/protobuf/gogoproto@v1.2.1 && \
+    GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.2 && \
+    GO111MODULE=on go get github.com/golang/protobuf/protoc-gen-go@v1.3.1 && \
+    GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1 && \
+    GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v1.9.2 && \
+    GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v1.9.2 && \
+    GO111MODULE=on go get github.com/jstemmer/go-junit-report@v0.0.0-20190106144839-af01ea7f8024 && \
+    GO111MODULE=on go get github.com/mattn/goreman@v0.2.1 && \
+    GO111MODULE=on go get golang.org/x/tools/cmd/goimports@v0.0.0-20190627203933-19ff4fff8850
+
+ENV KUSTOMIZE_VERSION=2.0.3
+RUN curl -L -o /usr/local/bin/kustomize https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64 && \
+    chmod +x /usr/local/bin/kustomize && \
+    kustomize version
+
+# Install helm
+ENV HELM_VERSION=2.12.1
+RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
+    tar -C /tmp/ -xf helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
+    mv /tmp/linux-amd64/helm /usr/local/bin/helm && \
+    helm version --client
+
+RUN helm init --client-only
+
+RUN apt-get update && apt-get install -y \
+    zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN curl -sLf -C - -o /tmp/swagger https://github.com/go-swagger/go-swagger/releases/download/v0.19.0/swagger_linux_amd64 && \
+    cp /tmp/swagger /usr/local/bin/swagger && \
+    chmod +x /usr/local/bin/swagger && \
+    swagger version
+
+RUN curl -sLf -C - -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip && \
+    unzip /tmp/protoc.zip bin/protoc -d /usr/local/ && \
+    chmod +x /usr/local/bin/protoc && \
+    unzip /tmp/protoc.zip include/* -d /usr/local/ && \
+    protoc --version
+
+RUN curl -sLf -C - -o /tmp/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \
+    cp /tmp/jq /usr/local/bin/jq && \
+    chmod +x /usr/local/bin/jq && \
+    jq --version
--- a/hack/generate-proto.sh
+++ b/hack/generate-proto.sh
@@ -65,15 +65,8 @@ go build -i -o dist/protoc-gen-swagger ./vendor/github.com/grpc-ecosystem/grpc-g
 # Generate server/<service>/(<service>.pb.go|<service>.pb.gw.go)
 PROTO_FILES=$(find $PROJECT_ROOT \( -name "*.proto" -and -path '*/server/*' -or -path '*/reposerver/*' -and -name "*.proto" \) | sort)
 for i in ${PROTO_FILES}; do
-    # Path to the google API gateway annotations.proto will be different depending if we are
-    # building natively (e.g. from workspace) vs. part of a docker build.
-    if [ -f /.dockerenv ]; then
-        GOOGLE_PROTO_API_PATH=$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
-        GOGO_PROTOBUF_PATH=$GOPATH/src/github.com/gogo/protobuf
-    else
-        GOOGLE_PROTO_API_PATH=${PROJECT_ROOT}/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
-        GOGO_PROTOBUF_PATH=${PROJECT_ROOT}/vendor/github.com/gogo/protobuf
-    fi
+    GOOGLE_PROTO_API_PATH=${PROJECT_ROOT}/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
+    GOGO_PROTOBUF_PATH=${PROJECT_ROOT}/vendor/github.com/gogo/protobuf
    protoc \
        -I${PROJECT_ROOT} \
        -I/usr/local/include \
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -1,6 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

+bases:
+- ./application-controller
+- ./dex
+- ./repo-server
+- ./server
+- ./config
+- ./redis

 images:
 - name: argoproj/argocd
@@ -9,10 +16,3 @@ images:
 - name: argoproj/argocd-ui
  newName: argoproj/argocd-ui
  newTag: latest
-resources:
- ./application-controller
- ./dex
- ./repo-server
- ./server
- ./config
- ./redis
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -7,6 +7,14 @@ patchesStrategicMerge:
 - overlays/argocd-server-deployment.yaml
 - overlays/argocd-application-controller-deployment.yaml

+bases:
+- ../../base/application-controller
+- ../../base/dex
+- ../../base/repo-server
+- ../../base/server
+- ../../base/config
+- ./redis-ha
+
 images:
 - name: argoproj/argocd
  newName: argoproj/argocd
@@ -14,10 +22,3 @@ images:
 - name: argoproj/argocd-ui
  newName: argoproj/argocd-ui
  newTag: latest
-resources:
- ../../base/application-controller
- ../../base/dex
- ../../base/repo-server
- ../../base/server
- ../../base/config
- ./redis-ha
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -2794,30 +2794,6 @@ spec:
 ---
 apiVersion: v1
 kind: Service
-metadata:
-  annotations: null
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis-ha
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis-ha
-spec:
-  clusterIP: None
-  ports:
-  - name: server
-    port: 6379
-    protocol: TCP
-    targetPort: redis
-  - name: sentinel
-    port: 26379
-    protocol: TCP
-    targetPort: sentinel
-  selector:
-    app.kubernetes.io/name: argocd-redis-ha
-  type: ClusterIP
---
-apiVersion: v1
-kind: Service
 metadata:
  annotations:
    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
@@ -2896,6 +2872,30 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  annotations: null
+  labels:
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/name: argocd-redis-ha
+    app.kubernetes.io/part-of: argocd
+  name: argocd-redis-ha
+spec:
+  clusterIP: None
+  ports:
+  - name: server
+    port: 6379
+    protocol: TCP
+    targetPort: redis
+  - name: sentinel
+    port: 26379
+    protocol: TCP
+    targetPort: sentinel
+  selector:
+    app.kubernetes.io/name: argocd-redis-ha
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: repo-server
@@ -2917,6 +2917,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server-metrics
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server-metrics
+spec:
+  ports:
+  - name: metrics
+    port: 8083
+    protocol: TCP
+    targetPort: 8083
+  selector:
+    app.kubernetes.io/name: argocd-server
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: server
@@ -2936,23 +2953,6 @@ spec:
  selector:
    app.kubernetes.io/name: argocd-server
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: argocd-server-metrics
-    app.kubernetes.io/part-of: argocd
-  name: argocd-server-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 8083
-    protocol: TCP
-    targetPort: 8083
-  selector:
-    app.kubernetes.io/name: argocd-server
---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -2709,30 +2709,6 @@ spec:
 ---
 apiVersion: v1
 kind: Service
-metadata:
-  annotations: null
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis-ha
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis-ha
-spec:
-  clusterIP: None
-  ports:
-  - name: server
-    port: 6379
-    protocol: TCP
-    targetPort: redis
-  - name: sentinel
-    port: 26379
-    protocol: TCP
-    targetPort: sentinel
-  selector:
-    app.kubernetes.io/name: argocd-redis-ha
-  type: ClusterIP
---
-apiVersion: v1
-kind: Service
 metadata:
  annotations:
    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
@@ -2811,6 +2787,30 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  annotations: null
+  labels:
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/name: argocd-redis-ha
+    app.kubernetes.io/part-of: argocd
+  name: argocd-redis-ha
+spec:
+  clusterIP: None
+  ports:
+  - name: server
+    port: 6379
+    protocol: TCP
+    targetPort: redis
+  - name: sentinel
+    port: 26379
+    protocol: TCP
+    targetPort: sentinel
+  selector:
+    app.kubernetes.io/name: argocd-redis-ha
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: repo-server
@@ -2832,6 +2832,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server-metrics
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server-metrics
+spec:
+  ports:
+  - name: metrics
+    port: 8083
+    protocol: TCP
+    targetPort: 8083
+  selector:
+    app.kubernetes.io/name: argocd-server
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: server
@@ -2851,23 +2868,6 @@ spec:
  selector:
    app.kubernetes.io/name: argocd-server
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: argocd-server-metrics
-    app.kubernetes.io/part-of: argocd
-  name: argocd-server-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 8083
-    protocol: TCP
-    targetPort: 8083
-  selector:
-    app.kubernetes.io/name: argocd-server
---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -2689,6 +2689,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server-metrics
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server-metrics
+spec:
+  ports:
+  - name: metrics
+    port: 8083
+    protocol: TCP
+    targetPort: 8083
+  selector:
+    app.kubernetes.io/name: argocd-server
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: server
@@ -2708,23 +2725,6 @@ spec:
  selector:
    app.kubernetes.io/name: argocd-server
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: argocd-server-metrics
-    app.kubernetes.io/part-of: argocd
-  name: argocd-server-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 8083
-    protocol: TCP
-    targetPort: 8083
-  selector:
-    app.kubernetes.io/name: argocd-server
---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -2604,6 +2604,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server-metrics
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server-metrics
+spec:
+  ports:
+  - name: metrics
+    port: 8083
+    protocol: TCP
+    targetPort: 8083
+  selector:
+    app.kubernetes.io/name: argocd-server
+---
+apiVersion: v1
+kind: Service
 metadata:
  labels:
    app.kubernetes.io/component: server
@@ -2623,23 +2640,6 @@ spec:
  selector:
    app.kubernetes.io/name: argocd-server
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: argocd-server-metrics
-    app.kubernetes.io/part-of: argocd
-  name: argocd-server-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 8083
-    protocol: TCP
-    targetPort: 8083
-  selector:
-    app.kubernetes.io/name: argocd-server
---
 apiVersion: apps/v1
 kind: Deployment
 metadata: