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

remove old argocd plugins configuration #299

Merged
merged 1 commit into from
Apr 4, 2023

Conversation

mmalyska
Copy link
Owner

@mmalyska mmalyska commented Apr 4, 2023

No description provided.

@mmalyska mmalyska self-assigned this Apr 4, 2023
@mmalyska mmalyska linked an issue Apr 4, 2023 that may be closed by this pull request
@bendo-bot bendo-bot bot added area/cluster Changes made in the cluster directory size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 4, 2023
@github-actions
Copy link

github-actions bot commented Apr 4, 2023

Path: cluster/core/argocd/base

@@ -14702,18 +14702,6 @@
 data:
   accounts.mmalyska: apiKey,login
   admin.enabled: "false"
-  configManagementPlugins: |
-    - name: replacer-helm
-      init:
-        command: ["/bin/sh", "-c"]
-        args: ["helm dependency build"]
-      generate:
-        command: [sh, -c]
-        args: ["helm template --release-name $ARGOCD_APP_NAME --namespace $ARGOCD_APP_NAMESPACE --kube-version $KUBE_VERSION --api-versions $KUBE_API_VERSIONS . | argocd-secret-replacer sops -f $ARGOCD_ENV_SOPS_FILE"]
-    - name: replacer-kustomize
-      generate:
-        command: ["sh", "-c"]
-        args: ["kustomize build --enable-alpha-plugins . | argocd-secret-replacer sops -f $ARGOCD_ENV_SOPS_FILE"]
   oidc.config: |
     name: Keycloak
     issuer: https://l.<secret:private-domain>/realms/home
@@ -15434,14 +15422,78 @@
       automountServiceAccountToken: false
       containers:
         - command:
+            - /var/run/argocd/argocd-cmp-server
+          env:
+            - name: SOPS_AGE_KEY_FILE
+              value: /sops-age/key
+          image: ghcr.io/mmalyska/argocd-secret-replacer:rolling@sha256:b61c297c318e84f8d642c9174f09f0ae59d13748dec886e3912c39057765cdb7
+          name: sops-replacer-plugin-kustomize
+          resources:
+            limits:
+              cpu: 250m
+              memory: 512Mi
+            requests:
+              cpu: 10m
+              memory: 16Mi
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 999
+          volumeMounts:
+            - mountPath: /var/run/argocd
+              name: var-files
+            - mountPath: /home/argocd/cmp-server/plugins
+              name: plugins
+            - mountPath: /tmp
+              name: tmp-sops-replacer-plugin
+            - mountPath: /home/argocd/cmp-server/config/plugin.yaml
+              name: sops-replacer-plugin
+              subPath: sops-replacer-plugin-kustomize.yaml
+            - mountPath: /sops-age/key
+              name: sops-age
+              subPath: age.agekey
+        - command:
+            - /var/run/argocd/argocd-cmp-server
+          env:
+            - name: SOPS_AGE_KEY_FILE
+              value: /sops-age/key
+            - name: HELM_CACHE_HOME
+              value: /helm-working-dir
+            - name: HELM_CONFIG_HOME
+              value: /helm-working-dir
+            - name: HELM_DATA_HOME
+              value: /helm-working-dir
+          image: ghcr.io/mmalyska/argocd-secret-replacer:rolling@sha256:b61c297c318e84f8d642c9174f09f0ae59d13748dec886e3912c39057765cdb7
+          name: sops-replacer-plugin-helm
+          resources:
+            limits:
+              cpu: 250m
+              memory: 512Mi
+            requests:
+              cpu: 10m
+              memory: 16Mi
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 999
+          volumeMounts:
+            - mountPath: /var/run/argocd
+              name: var-files
+            - mountPath: /home/argocd/cmp-server/plugins
+              name: plugins
+            - mountPath: /tmp
+              name: tmp-sops-replacer-plugin
+            - mountPath: /home/argocd/cmp-server/config/plugin.yaml
+              name: sops-replacer-plugin
+              subPath: sops-replacer-plugin-helm.yaml
+            - mountPath: /sops-age/key
+              name: sops-age
+              subPath: age.agekey
+            - mountPath: /helm-working-dir
+              name: helm-working-dir
+        - command:
             - sh
             - -c
             - entrypoint.sh argocd-repo-server --redis argocd-redis:6379
           env:
-            - name: SOPS_AGE_KEY_FILE
-              value: /sops-age/key
-            - name: ARGOCD_ENV_SOPS_EXE
-              value: /custom-tools/sops
             - name: ARGOCD_RECONCILIATION_TIMEOUT
               valueFrom:
                 configMapKeyRef:
@@ -15598,15 +15650,6 @@
             seccompProfile:
               type: RuntimeDefault
           volumeMounts:
-            - mountPath: /custom-tools/sops
-              name: custom-tools
-              subPath: sops
-            - mountPath: /sops-age/key
-              name: sops-age
-              subPath: age.agekey
-            - mountPath: /usr/local/bin/argocd-secret-replacer
-              name: custom-tools
-              subPath: argocd-secret-replacer
             - mountPath: /app/config/ssh
               name: ssh-known-hosts
             - mountPath: /app/config/tls
@@ -15623,109 +15666,7 @@
               name: helm-working-dir
             - mountPath: /home/argocd/cmp-server/plugins
               name: plugins
-        - command:
-            - /var/run/argocd/argocd-cmp-server
-          env:
-            - name: SOPS_AGE_KEY_FILE
-              value: /sops-age/key
-          image: ghcr.io/mmalyska/argocd-secret-replacer:rolling@sha256:b61c297c318e84f8d642c9174f09f0ae59d13748dec886e3912c39057765cdb7
-          name: sops-replacer-plugin-kustomize
-          resources:
-            limits:
-              cpu: 250m
-              memory: 512Mi
-            requests:
-              cpu: 10m
-              memory: 16Mi
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 999
-          volumeMounts:
-            - mountPath: /var/run/argocd
-              name: var-files
-            - mountPath: /home/argocd/cmp-server/plugins
-              name: plugins
-            - mountPath: /tmp
-              name: tmp-sops-replacer-plugin
-            - mountPath: /home/argocd/cmp-server/config/plugin.yaml
-              name: sops-replacer-plugin
-              subPath: sops-replacer-plugin-kustomize.yaml
-            - mountPath: /sops-age/key
-              name: sops-age
-              subPath: age.agekey
-        - command:
-            - /var/run/argocd/argocd-cmp-server
-          env:
-            - name: SOPS_AGE_KEY_FILE
-              value: /sops-age/key
-            - name: HELM_CACHE_HOME
-              value: /helm-working-dir
-            - name: HELM_CONFIG_HOME
-              value: /helm-working-dir
-            - name: HELM_DATA_HOME
-              value: /helm-working-dir
-          image: ghcr.io/mmalyska/argocd-secret-replacer:rolling@sha256:b61c297c318e84f8d642c9174f09f0ae59d13748dec886e3912c39057765cdb7
-          name: sops-replacer-plugin-helm
-          resources:
-            limits:
-              cpu: 250m
-              memory: 512Mi
-            requests:
-              cpu: 10m
-              memory: 16Mi
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 999
-          volumeMounts:
-            - mountPath: /var/run/argocd
-              name: var-files
-            - mountPath: /home/argocd/cmp-server/plugins
-              name: plugins
-            - mountPath: /tmp
-              name: tmp-sops-replacer-plugin
-            - mountPath: /home/argocd/cmp-server/config/plugin.yaml
-              name: sops-replacer-plugin
-              subPath: sops-replacer-plugin-helm.yaml
-            - mountPath: /sops-age/key
-              name: sops-age
-              subPath: age.agekey
-            - mountPath: /helm-working-dir
-              name: helm-working-dir
       initContainers:
-        - args:
-            - |
-              echo "Initializing custom tools...";
-
-              echo "Downloading sops...";
-              wget -qO /custom-tools/sops https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux
-
-              echo "Downloading secret replacer...";
-              wget -qO- https://github.com/mmalyska/argocd-secret-replacer/releases/download/${REPLACER_VERSION}/secret-replacer-${REPLACER_VERSION}-linux-x64.tar.gz | tar -C /custom-tools -xzf-;
-
-              echo "Downloading secret replacer musl...";
-              mkdir /custom-tools/musl
-              wget -qO- https://github.com/mmalyska/argocd-secret-replacer/releases/download/${REPLACER_VERSION}/secret-replacer-${REPLACER_VERSION}-linux-musl-x64.tar.gz | tar -C /custom-tools/musl -xzf-;
-
-              echo "Setting executable mode...";
-              chmod +x /custom-tools/*
-              chmod +x /custom-tools/musl/*
-
-              echo "Listing downloaded tools";
-              ls -la /custom-tools
-              echo "Done.";
-          command:
-            - sh
-            - -ec
-          env:
-            - name: SOPS_VERSION
-              value: v3.7.3
-            - name: REPLACER_VERSION
-              value: v0.2.1
-          image: alpine:latest@sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126
-          name: download-tools
-          volumeMounts:
-            - mountPath: /custom-tools
-              name: custom-tools
         - command:
             - cp
             - -n
@@ -15751,8 +15692,6 @@
             name: sops-replacer-plugin
           name: sops-replacer-plugin
         - emptyDir: {}
-          name: custom-tools
-        - emptyDir: {}
           name: tmp-sops-replacer-plugin
         - name: sops-age
           secret:

@bendo-bot
Copy link
Contributor

bendo-bot bot commented Apr 4, 2023

🦙 MegaLinter status: ✅ SUCCESS

Descriptor Linter Files Fixed Errors Elapsed time
✅ REPOSITORY git_diff yes no 0.04s
✅ REPOSITORY secretlint yes no 2.39s
✅ YAML prettier 2 0 0.79s
✅ YAML yamllint 2 0 0.36s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@mmalyska mmalyska merged commit 5ade5f5 into main Apr 4, 2023
@mmalyska mmalyska deleted the 14-migrate-argo-cd-plugins-to-sidecars branch April 4, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cluster Changes made in the cluster directory size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate Argo CD plugins to sidecars
1 participant