resolve PR comments

codefresh-io · Nov 27, 2023 · 0d22e8d · 0d22e8d
1 parent 2e59eda
commit 0d22e8d
Show file tree

Hide file tree

Showing 2 changed files with 354 additions and 318 deletions.
diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -18863,7 +18863,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: event-reporter
     app.kubernetes.io/name: event-reporter
     app.kubernetes.io/part-of: argocd
   name: event-reporter
@@ -19040,7 +19040,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: event-reporter
     app.kubernetes.io/name: event-reporter
     app.kubernetes.io/part-of: argocd
   name: event-reporter
@@ -19207,7 +19207,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: event-reporter
     app.kubernetes.io/name: event-reporter
     app.kubernetes.io/part-of: argocd
   name: event-reporter
@@ -19469,8 +19469,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: argocd-server
+    app.kubernetes.io/component: event-reporter
+    app.kubernetes.io/name: event-reporter
     app.kubernetes.io/part-of: argocd
   name: event-reporter
 spec:
@@ -19490,16 +19490,16 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: event-reporter
     app.kubernetes.io/name: event-reporter-metrics
     app.kubernetes.io/part-of: argocd
   name: event-reporter-metrics
 spec:
   ports:
   - name: metrics
-    port: 8089
+    port: 8087
     protocol: TCP
-    targetPort: 8089
+    targetPort: 8087
   selector:
     app.kubernetes.io/name: event-reporter
 ---
@@ -20442,157 +20442,6 @@ spec:
           secretName: argocd-dex-server-tls
 ---
 apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: event-reporter
-    app.kubernetes.io/part-of: argocd
-  name: event-reporter
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: event-reporter
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: event-reporter
-    spec:
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/name: event-reporter
-              topologyKey: kubernetes.io/hostname
-            weight: 100
-          - podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  app.kubernetes.io/part-of: argocd
-              topologyKey: kubernetes.io/hostname
-            weight: 5
-      containers:
-      - args:
-        - /usr/local/bin/event-reporter-server
-        env:
-        - name: EVENT_REPORTER_INSECURE
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.insecure
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_LOGFORMAT
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.log.format
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_LOG_LEVEL
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.log.level
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_REPO_SERVER
-          valueFrom:
-            configMapKeyRef:
-              key: repo.server
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.repo.server.timeout.seconds
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_REPO_SERVER_PLAINTEXT
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.repo.server.plaintext
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: REDIS_SERVER
-          valueFrom:
-            configMapKeyRef:
-              key: redis.server
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: REDISDB
-          valueFrom:
-            configMapKeyRef:
-              key: redis.db
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_LISTEN_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.listen.address
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: EVENT_REPORTER_METRICS_LISTEN_ADDRESS
-          valueFrom:
-            configMapKeyRef:
-              key: event-reporter.metrics.listen.address
-              name: argocd-cmd-params-cm
-              optional: true
-        image: docker.io/xeonalex/personal-argocd-dev:reporter-v2
-        imagePullPolicy: Always
-        livenessProbe:
-          httpGet:
-            path: /healthz?full=true
-            port: 8080
-          initialDelaySeconds: 3
-          periodSeconds: 30
-          timeoutSeconds: 5
-        name: argocd-server
-        ports:
-        - containerPort: 8088
-        - containerPort: 8085
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-          initialDelaySeconds: 3
-          periodSeconds: 30
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          seccompProfile:
-            type: RuntimeDefault
-        volumeMounts:
-        - mountPath: /app/config/ssh
-          name: ssh-known-hosts
-        - mountPath: /app/config/tls
-          name: tls-certs
-        - mountPath: /app/config/server/tls
-          name: argocd-repo-server-tls
-        - mountPath: /tmp
-          name: tmp
-      serviceAccountName: event-reporter
-      volumes:
-      - emptyDir: {}
-        name: plugins-home
-      - emptyDir: {}
-        name: tmp
-      - name: argocd-repo-server-tls
-        secret:
-          items:
-          - key: tls.crt
-            path: tls.crt
-          - key: tls.key
-            path: tls.key
-          - key: ca.crt
-            path: ca.crt
-          optional: true
-          secretName: argocd-repo-server-tls
----
-apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
@@ -20806,6 +20655,175 @@ spec:
           optional: true
           secretName: argocd-repo-server-tls
 ---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  labels:
+    app.kubernetes.io/component: event-reporter
+    app.kubernetes.io/name: event-reporter
+    app.kubernetes.io/part-of: argocd
+  name: event-reporter
+spec:
+  replicas: 5
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: event-reporter
+  serviceName: event-reporter
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: event-reporter
+    spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: event-reporter
+              topologyKey: kubernetes.io/hostname
+            weight: 100
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/part-of: argocd
+              topologyKey: kubernetes.io/hostname
+            weight: 5
+      containers:
+      - args:
+        - /usr/local/bin/event-reporter-server
+        env:
+        - name: EVENT_REPORTER_REPLICAS
+          value: "5"
+        - name: ARGOCD_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: token
+              name: argocd-token
+        - name: CODEFRESH_URL
+          valueFrom:
+            configMapKeyRef:
+              key: base-url
+              name: codefresh-cm
+              optional: true
+        - name: CODEFRESH_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: token
+              name: codefresh-token
+        - name: EVENT_REPORTER_INSECURE
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.insecure
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_LOGFORMAT
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.log.format
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_LOG_LEVEL
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.log.level
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_REPO_SERVER
+          valueFrom:
+            configMapKeyRef:
+              key: repo.server
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_REPO_SERVER_TIMEOUT_SECONDS
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.repo.server.timeout.seconds
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_REPO_SERVER_PLAINTEXT
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.repo.server.plaintext
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: REDIS_SERVER
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: REDISDB
+          valueFrom:
+            configMapKeyRef:
+              key: redis.db
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_LISTEN_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.listen.address
+              name: argocd-cmd-params-cm
+              optional: true
+        - name: EVENT_REPORTER_METRICS_LISTEN_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              key: event-reporter.metrics.listen.address
+              name: argocd-cmd-params-cm
+              optional: true
+        image: quay.io/codefresh/argocd:latest
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /healthz?full=true
+            port: health
+          initialDelaySeconds: 3
+          periodSeconds: 30
+          timeoutSeconds: 5
+        name: event-reporter
+        ports:
+        - containerPort: 8088
+          name: health
+        - containerPort: 8087
+          name: metrics
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: health
+          initialDelaySeconds: 3
+          periodSeconds: 30
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          seccompProfile:
+            type: RuntimeDefault
+        volumeMounts:
+        - mountPath: /app/config/server/tls
+          name: argocd-repo-server-tls
+        - mountPath: /tmp
+          name: tmp
+      serviceAccountName: event-reporter
+      volumes:
+      - emptyDir: {}
+        name: plugins-home
+      - emptyDir: {}
+        name: tmp
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
+---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata: