Adjustments to the telco core policies (#49)

Author: akrzos

ansible/roles/telco-core-ztp/defaults/main.yml

@@ -3,3 +3,7 @@
 
 # Currently only the 4.18 profile has been placed and adjusted for this testing in this repo
 telco_core_profile_version: 4.18
+
+# Enable means uncommented, so false means comment out for now
+telco_core_cluster_logging_version_enable: false
+telco_core_cluster_logging_version: cluster-logging.v6.0.0

ansible/roles/telco-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml

@@ -5,7 +5,7 @@ metadata:
   name: cluster-logging
   namespace: openshift-logging
 spec:
-  channel: "stable-6.0"
+  channel: "stable-6.1"
   name: cluster-logging
   source: redhat-operators-disconnected
   sourceNamespace: openshift-marketplace

ansible/roles/telco-core-ztp/tasks/main.yml

@@ -28,10 +28,10 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   loop:
-  - src: cluster-ns-application.yaml
-    dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/cluster-applications/ztp-core.yaml"
-  - src: policy-baseline-application.yaml
-    dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy-applications/ztp-core.yaml"
+  - src: cluster-application.yaml
+    dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/cluster-applications/ztp-core-cluster.yaml"
+  - src: policy-application.yaml
+    dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy-applications/ztp-core-policies.yaml"
 
 # https://github.com/openshift-kni/telco-reference/tree/release-4.18/telco-core/configuration
 - name: Template Telco Core Profile policy manifests into cnf-features-deploy

ansible/roles/telco-core-ztp/templates/cluster-ns-application.yaml renamed to ansible/roles/telco-core-ztp/templates/cluster-application.yaml

@@ -1,18 +1,13 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ztp-core
----
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ztp-core
+  name: ztp-core-cluster
   namespace: openshift-gitops
 spec:
   destination:
     server: https://kubernetes.default.svc
-    namespace: ztp-core
+    namespace: ztp-core-cluster
   project: ztp-app-project
   source:
     path: ztp/gitops-subscriptions/argocd/cluster/ztp-core

ansible/roles/telco-core-ztp/templates/policy-baseline-application.yaml renamed to ansible/roles/telco-core-ztp/templates/policy-application.yaml

@@ -2,12 +2,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: policy-telco-core
+  name: ztp-core-policies
   namespace: openshift-gitops
 spec:
   destination:
     server: https://kubernetes.default.svc
-    namespace: ztp-site
+    namespace: ztp-core-policies
   project: policy-app-project
   source:
     path: ztp/gitops-subscriptions/argocd/policy/telco-core

ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml

@@ -2,7 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 generators:
 - core-baseline.yaml
-- core-overlay.yaml
+# Overlay commented out until template-value ConfigMaps completed
+# - core-overlay.yaml
 # - core-upgrade.yaml
 
 resources:

ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml

@@ -40,7 +40,11 @@ policies:
               - kind: ClusterServiceVersion
                 namespace: openshift-logging
                 # Update with specific target version
-                name: cluster-logging.v6.0.0
+{% if telco_core_cluster_logging_version_enable %}
+                name: {{ telco_core_cluster_logging_version }}
+{% else %}
+                # name: {{ telco_core_cluster_logging_version }}
+{% endif %}
                 conditions:
                   - type: Succeeded
                     status: "True"

ansible/roles/telco-core-ztp/templates/release-4.18/ns.yaml

@@ -1,5 +1,10 @@
 ---
 apiVersion: v1
 kind: Namespace
+metadata:
+  name: ztp-core-cluster
+---
+apiVersion: v1
+kind: Namespace
 metadata:
   name: ztp-core-policies