diff --git a/salt/metalk8s/addons/logging/deployed/dashboards.sls b/salt/metalk8s/addons/logging/deployed/dashboards.sls index c557332811..705f347a09 100644 --- a/salt/metalk8s/addons/logging/deployed/dashboards.sls +++ b/salt/metalk8s/addons/logging/deployed/dashboards.sls @@ -14,14 +14,3 @@ 'tags': ['logging'], }, ]) }} - -{#- In MetalK8s 128.0 we changed the fluent-bit dashboard to use - the one from the helm chart. We need to remove the old one - to avoid conflicts. - This can be removed in `development/129.0` #} -Ensure old fluent-bit dashboard does no longer exists: - metalk8s_kubernetes.object_absent: - - name: fluent-bit-dashboard - - namespace: metalk8s-monitoring - - apiVersion: v1 - - kind: ConfigMap diff --git a/salt/metalk8s/addons/metalk8s-operator/deployed/init.sls b/salt/metalk8s/addons/metalk8s-operator/deployed/init.sls index 72ad28636b..3223c9b583 100644 --- a/salt/metalk8s/addons/metalk8s-operator/deployed/init.sls +++ b/salt/metalk8s/addons/metalk8s-operator/deployed/init.sls @@ -1,17 +1,6 @@ include: - .manifests -{#- In MetalK8s 128.0 this config has been removed - This can be removed in `development/129.0` #} -Ensure old MetalK8s operator config does no longer exists: - metalk8s_kubernetes.object_absent: - - name: metalk8s-operator-manager-config - - namespace: kube-system - - apiVersion: v1 - - kind: ConfigMap - - require: - - sls: metalk8s.addons.metalk8s-operator.deployed.manifests - Wait for the MetalK8s Operator to be Ready: test.configurable_test_state: - changes: False diff --git a/salt/metalk8s/addons/prometheus-operator/deployed/init.sls b/salt/metalk8s/addons/prometheus-operator/deployed/init.sls index e7467521b5..65c02686c8 100644 --- a/salt/metalk8s/addons/prometheus-operator/deployed/init.sls +++ b/salt/metalk8s/addons/prometheus-operator/deployed/init.sls @@ -9,14 +9,3 @@ include: - .node-alerts-rules - .kube-alerts-rules - .thanos-chart - -{#- In MetalK8s 128.0 this secret has been removed - This can be removed in `development/129.0` #} -Ensure old prometheus secret does no longer exists: - metalk8s_kubernetes.object_absent: - - name: prometheus-operator-prometheus - - namespace: metalk8s-monitoring - - apiVersion: v1 - - kind: Secret - - require: - - sls: metalk8s.addons.prometheus-operator.deployed.chart diff --git a/salt/metalk8s/addons/volumes/deployed/init.sls b/salt/metalk8s/addons/volumes/deployed/init.sls index 4fa417da5a..2ee49b4883 100644 --- a/salt/metalk8s/addons/volumes/deployed/init.sls +++ b/salt/metalk8s/addons/volumes/deployed/init.sls @@ -1,13 +1,2 @@ include: - .manifests - -{#- In MetalK8s 128.0 this config has been removed - This can be removed in `development/129.0` #} -Ensure old Storage operator config does no longer exists: - metalk8s_kubernetes.object_absent: - - name: storage-operator-manager-config - - namespace: kube-system - - apiVersion: v1 - - kind: ConfigMap - - require: - - sls: metalk8s.addons.volumes.deployed.manifests diff --git a/salt/metalk8s/orchestrate/downgrade/init.sls b/salt/metalk8s/orchestrate/downgrade/init.sls index d3f45b0e63..49b4eb8e7c 100644 --- a/salt/metalk8s/orchestrate/downgrade/init.sls +++ b/salt/metalk8s/orchestrate/downgrade/init.sls @@ -111,25 +111,6 @@ Deploy Kubernetes service config objects: - require_in: - salt: Deploy Kubernetes objects -{#- In MetalK8s 128.0 we changed the fluent-bit dashboard, - so we have to remove the new one when dowgrading - to avoid conflicts - This can be removed in `development/129.0` #} -{%- if salt.pkg.version_cmp(dest_version, '128.0.0') == -1 %} - -Delete the new fluent-bit dashboard: - metalk8s_kubernetes.object_absent: - - name: fluent-bit-dashboard-fluent-bit - - namespace: metalk8s-logging - - apiVersion: v1 - - kind: ConfigMap - - require: - - salt: Deploy Kubernetes service config objects - - require_in: - - salt: Deploy Kubernetes objects - -{%- endif %} - Deploy Kubernetes objects: salt.runner: - name: state.orchestrate