diff --git a/argocd/kustomize-helm-with-rewrite/.gitignore b/argocd/helm-kustomize/.gitignore similarity index 100% rename from argocd/kustomize-helm-with-rewrite/.gitignore rename to argocd/helm-kustomize/.gitignore diff --git a/argocd/kustomize-helm-with-rewrite/Dockerfile b/argocd/helm-kustomize/Dockerfile similarity index 100% rename from argocd/kustomize-helm-with-rewrite/Dockerfile rename to argocd/helm-kustomize/Dockerfile diff --git a/argocd/kustomize-helm-with-rewrite/deploy.sh b/argocd/helm-kustomize/deploy.sh similarity index 100% rename from argocd/kustomize-helm-with-rewrite/deploy.sh rename to argocd/helm-kustomize/deploy.sh diff --git a/argocd/kustomize-helm-with-rewrite/generate.sh b/argocd/helm-kustomize/generate.sh similarity index 96% rename from argocd/kustomize-helm-with-rewrite/generate.sh rename to argocd/helm-kustomize/generate.sh index d0cf4ca4..f7a2c246 100644 --- a/argocd/kustomize-helm-with-rewrite/generate.sh +++ b/argocd/helm-kustomize/generate.sh @@ -29,7 +29,6 @@ mkdir -p base echo "helm template -n $ARGOCD_APP_NAMESPACE $PARAM_FLAGS $VALUES $ARGOCD_APP_NAME $CHART" > /tmp/$ARGOCD_APP_NAME-helm.sh helm template -n $ARGOCD_APP_NAMESPACE $PARAM_FLAGS $VALUES $ARGOCD_APP_NAME $CHART > ./base/_manifest.yaml -sed -i "$PARAM_REWRITE" ./base/_manifest.yaml cp ./base/_manifest.yaml /tmp/$ARGOCD_APP_NAME-manifest.yaml [ -d "$PARAM_ENV" ] && kubectl kustomize $PARAM_ENV > /tmp/$ARGOCD_APP_NAME-manifest.yaml diff --git a/argocd/kustomize-helm-with-rewrite/get-values.sh b/argocd/helm-kustomize/get-values.sh similarity index 100% rename from argocd/kustomize-helm-with-rewrite/get-values.sh rename to argocd/helm-kustomize/get-values.sh diff --git a/argocd/kustomize-helm-with-rewrite/init-helm-repos.sh b/argocd/helm-kustomize/init-helm-repos.sh similarity index 100% rename from argocd/kustomize-helm-with-rewrite/init-helm-repos.sh rename to argocd/helm-kustomize/init-helm-repos.sh diff --git a/argocd/kustomize-helm-with-rewrite/init.sh b/argocd/helm-kustomize/init.sh similarity index 100% rename from argocd/kustomize-helm-with-rewrite/init.sh rename to argocd/helm-kustomize/init.sh diff --git a/argocd/kustomize-helm-with-rewrite/plugin.yaml b/argocd/helm-kustomize/plugin.yaml similarity index 93% rename from argocd/kustomize-helm-with-rewrite/plugin.yaml rename to argocd/helm-kustomize/plugin.yaml index d72ad88b..a353493e 100644 --- a/argocd/kustomize-helm-with-rewrite/plugin.yaml +++ b/argocd/helm-kustomize/plugin.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ConfigManagementPlugin metadata: - name: kustomize-helm-with-rewrite + name: helm-kustomize spec: # version: v1.2 # The init command runs in the Application source directory at the beginning of each manifest generation. The init @@ -52,13 +52,6 @@ spec: itemType: string collectionType: string string: "staging" - - name: rewrite - title: Rewrite - tooltip: sed rewrite experssion - required: false - itemType: string - collectionType: string - string: "" - name: chart title: Chart tooltip: Name or path of helm chart @@ -83,10 +76,10 @@ spec: # map: # some: value # collectionType: map - dynamic: + # dynamic: # The command is run in an Application's source directory. Standard output must be JSON matching the schema of the # static parameter announcements list. - command: [ /bin/sh, /plugin/get-values.sh ] + # command: [ /bin/sh, /plugin/get-values.sh ] # If set to `true` then the plugin receives repository files with original file mode. Dangerous since the repository # might have executable files. Set to true only if you trust the CMP plugin authors.