Merge pull request #52 from appuio/fix/plugin-docs

Revert ignore plugin differences
appuio · Feb 24, 2023 · ac17cb4 · ac17cb4
2 parents ef6430f + 13183a9
commit ac17cb4
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 74 deletions.
diff --git a/component/app.jsonnet b/component/app.jsonnet
@@ -3,19 +3,7 @@ local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;
 local argocd = import 'lib/argocd.libjsonnet';
 
-local app = argocd.App('openshift4-console', params.namespace, secrets=false) {
-  spec+: {
-    ignoreDifferences+: [
-      {
-        group: 'operator.openshift.io',
-        kind: 'Console',
-        jsonPointers: [
-          '/spec/plugins',
-        ],
-      },
-    ],
-  },
-};
+local app = argocd.App('openshift4-console', params.namespace, secrets=false);
 
 {
   'openshift4-console': app,

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -77,13 +77,6 @@ default:: `[]`
 
 Add plugins to the console.
 
-[IMPORTANT]
-====
-While adding custom plugins is supported, Argo CD will ignore differences to allow other components to patch this field.
-
-Manual syncs in Argo CD may be necessary.
-====
-
 === `config.route`
 
 [horizontal]

diff --git a/tests/golden/custom-links/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-links/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-logo/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-logo/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-plugins/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-plugins/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-route-4.7/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-route-4.7/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-route-legacy-4.7/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-route-legacy-4.7/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-route-legacy/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-route-legacy/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-route-managed-tls/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-route-managed-tls/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/custom-route/openshift4-console/apps/openshift4-console.yaml b/tests/golden/custom-route/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console

diff --git a/tests/golden/defaults/openshift4-console/apps/openshift4-console.yaml b/tests/golden/defaults/openshift4-console/apps/openshift4-console.yaml
@@ -1,6 +0,0 @@
-spec:
-  ignoreDifferences:
-    - group: operator.openshift.io
-      jsonPointers:
-        - /spec/plugins
-      kind: Console