-
Notifications
You must be signed in to change notification settings - Fork 3
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Path: @@ -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: |
🦙 MegaLinter status: ✅ SUCCESS
See detailed report in MegaLinter reports |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.