Migrate to OVNKubernetes and do upgrades of several components (#384)

* Migrate to OVNKubernetes network type and remove tealc completely after recreation Signed-off-by: Jakub Stejskal <xstejs24@gmail.com> * Add some minor fixes after migration Signed-off-by: Jakub Stejskal <xstejs24@gmail.com> * Rename few files Signed-off-by: Jakub Stejskal <xstejs24@gmail.com> * Add yq to skodjob-ee Signed-off-by: Jakub Stejskal <xstejs24@gmail.com> --------- Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>
skodjob · Jan 10, 2025 · 856b2fd · 856b2fd
1 parent 9f0267a
commit 856b2fd
Show file tree

Hide file tree

Showing 76 changed files with 929 additions and 686 deletions.
diff --git a/.github/workflows/image_build.yaml b/.github/workflows/image_build.yaml
diff --git a/.github/workflows/skodjob-ee.yaml b/.github/workflows/skodjob-ee.yaml
@@ -0,0 +1,35 @@
+name: skodjob-ee
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  image:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USER }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./skodjob-ee/context
+          file: ./skodjob-ee/context/Dockerfile
+          push: true
+          # TODO - Change org when we will create a new one
+          tags: quay.io/tealc/skodjob-ee:latest
diff --git a/.github/workflows/tealc-ee.yaml b/.github/workflows/tealc-ee.yaml
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 .vscode
-tealc-ci-test.yaml
+skodjob-ci-test.yaml
 **/kubeconfig
 install/kubeconfig
 **/.ssh/

diff --git a/install/ansible-navigator.yml b/install/ansible-navigator.yml
@@ -5,10 +5,7 @@ ansible-navigator:
 
   execution-environment:
     enabled: true
-    image: quay.io/tealc/tealc-ee:latest
-    pull:
-      arguments:
-        - "--platform linux/amd64"
+    image: quay.io/tealc/skodjob-ee:latest
     environment-variables:
       set:
         ANSIBLE_RUN_TAGS: 'infra,strimzi-infra'

diff --git a/install/examples/clusters.yaml b/install/examples/clusters.yaml
@@ -1,15 +1,15 @@
 ---
+# TODO - this is no longer valid, update it accordingly!
 #  Infra cluster configuration
 infra_access_token: placeholder
 infra_api_url: server_api_url
-infra_context_name: tealc-infra
+infra_context_name: skodjob-infra
 infra_username: pepa
 infra_token: zdepa
 
 # Paths info
 kubeconfig_path: configpath
 github_secret_path: configpath/install/examples/github-secret.yaml
-grafana_docker_secret_path: configpath/install/examples/docker-secret.yaml
 
 # Workers
 workers:
@@ -19,7 +19,7 @@ workers:
     access_token: placeholder
     username: pepa
     password: zdepa
-    monitoring_namespace: tealc
+    monitoring_namespace: skodjob
     environment: upstream
     workload: true
   release_cluster:
@@ -28,6 +28,6 @@ workers:
     access_token: placeholder
     username: pepa
     password: zdepa
-    monitoring_namespace: tealc
+    monitoring_namespace: skodjob
     environment: upstream
     workload: true
diff --git a/install/examples/github-secret.yaml b/install/examples/github-secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: github-secret
-  app: tealc
+  app: skodjob
 type: Opaque
 stringData:
   USERNAME: "pepa-ci"

diff --git a/install/roles/automation-hub/defaults/main.yml b/install/roles/automation-hub/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 # defaults file
-infra_monitoring_namespace: tealc-monitoring
-infra_ci_namespace: tealc-pipelines
+infra_monitoring_namespace: skodjob-monitoring
+infra_ci_namespace: skodjob-pipelines
 infra_workflow_namespace: skodjob-ci
-infra_argo_namespace: tealc-gitops
+infra_argo_namespace: skodjob-gitops
 
 openshift_pipelines_namespace: openshift-pipelines
 openshift_operators_namespace: openshift-operators
@@ -14,19 +14,19 @@ access_token: empty
 htpasswd_file: /tmp/htpasswd
 
 # GitOps
-gitops_channel_version: 1.13
-gitops_version: 1.13.1
+gitops_channel_version: 1.15
+gitops_version: 1.15.0
 
 # ACM
-acm_version: 2.11
-loki_version: 6.0
-openshift_logging_version: 6.0
-acm_namespace: tealc-rhacm
+acm_version: 2.12
+loki_version: 6.1
+openshift_logging_version: 6.1
+acm_namespace: skodjob-rhacm
 acm_observability_namespace: open-cluster-management-observability
 
 # ACS
-acs_version: 4.5
-acs_namespace: tealc-rhacs
+acs_version: 4.6
+acs_namespace: skodjob-rhacs
 acs_stackrox_namespace: stackrox
 acs_api_token_file: "{{ playbook_dir }}/acs_api_token"
 acs_init_secrets: "{{ playbook_dir }}/init-bundle.yaml"
@@ -37,8 +37,8 @@ cm_operator_namespace: cert-manager-operator
 cm_route53_credentials: route53-le-credentials
 cm_route53_secret_key_ref: secret-key
 cm_route53_access_key_ref: access-key
-cm_certificate_secret: tealc-signed-certificate
-cm_version: 1.14.0
+cm_certificate_secret: skodjob-signed-certificate
+cm_version: 1.14.1
 
 # Strimzi
 strimzi_operator_namespace: strimzi-operator

diff --git a/install/roles/automation-hub/tasks/common/check_parameters.yaml b/install/roles/automation-hub/tasks/common/check_parameters.yaml
@@ -18,8 +18,3 @@
   fail:
     msg: "Variable 'infra_api_url' is not defined"
   when: infra_api_url is not defined
-
-- name: Check that 'grafana_docker_secret_path' is not defined
-  fail:
-    msg: "Variable 'grafana_docker_secret_path' is not defined"
-  when: grafana_docker_secret_path is not defined
diff --git a/install/roles/automation-hub/tasks/common/setup_cluster_kubeconfig.yaml b/install/roles/automation-hub/tasks/common/setup_cluster_kubeconfig.yaml
@@ -1,10 +1,6 @@
 ##################################
 #### Set kubeconfig data from yaml
 ##################################
-- name: "Debug na zacatku"
-  debug:
-    msg: "{{ clusters_dict }}"
-
 - name: "Update facts for {{ cluster.name }} - kubeconfig based"
   ansible.utils.update_fact:
     updates:
@@ -51,7 +47,3 @@
     path: "{{ kubeconfig_path }}/{{ cluster.name }}"
     mode: '0755'
   when: clusters_dict[cluster.name].provisioned
-
-- name: "Debug na konci"
-  debug:
-    msg: "{{ clusters_dict }}"
diff --git a/install/roles/automation-hub/tasks/infra-setup/delete/cluster-logging/delete_loki_stack.yaml b/install/roles/automation-hub/tasks/infra-setup/delete/cluster-logging/delete_loki_stack.yaml
@@ -30,7 +30,7 @@
         region: "{{ aws_region | b64encode }}"
         bucketnames: "{{ bucketname | b64encode }}"
   vars:
-    bucketname: "tealc-{{ clusterName }}-loki"
+    bucketname: "skodjob-{{ clusterName }}-loki"
 
 - name: "Delete Loki subscription on {{ clusterName }}"
   kubernetes.core.k8s:

diff --git a/install/roles/automation-hub/tasks/infra-setup/delete/delete_links.yaml b/install/roles/automation-hub/tasks/infra-setup/delete/delete_links.yaml
@@ -1,5 +1,5 @@
 ---
-- name: Delete console link for tealc applications
+- name: Delete console link for skodjob applications
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     state: absent

diff --git a/install/roles/automation-hub/tasks/infra-setup/delete/delete_tekton.yaml b/install/roles/automation-hub/tasks/infra-setup/delete/delete_tekton.yaml
@@ -4,7 +4,7 @@
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     namespace: "{{ infra_ci_namespace }}"
     api_version: "triggers.tekton.dev/v1alpha1"
-    label_selectors: listener=tealc
+    label_selectors: listener=skodjob
     verify_ssl: no
     state: absent
     kind: EventListener

diff --git a/...tion-hub/tasks/infra-setup/install/advanced-cluster-management/install_observability.yaml b/...tion-hub/tasks/infra-setup/install/advanced-cluster-management/install_observability.yaml
@@ -49,7 +49,7 @@
     verify_ssl: no
     wait_condition:
       type: Ready
-      status: True
+      status: 'True'
       reason: Ready
 
 - name: "Create multicluster observability config map for custom metrics on {{ worker.name }} cluster"

diff --git a/...ll/roles/automation-hub/tasks/infra-setup/install/cluster-logging/install_loki_stack.yaml b/...ll/roles/automation-hub/tasks/infra-setup/install/cluster-logging/install_loki_stack.yaml
@@ -68,7 +68,7 @@
         region: "{{ aws_region | b64encode }}"
         bucketnames: "{{ bucketname | b64encode }}"
   vars:
-    bucketname: "tealc-{{ clusterName }}-loki"
+    bucketname: "skodjob-{{ clusterName }}-loki"
 
 - name: "Remove Grafana access on {{ clusterName }} to avoid conflicts"
   kubernetes.core.k8s:

diff --git a/install/roles/automation-hub/tasks/infra-setup/install/hive/02-deploy_cluster.yaml b/install/roles/automation-hub/tasks/infra-setup/install/hive/02-deploy_cluster.yaml
@@ -2,14 +2,14 @@
 # Create FIPs #
 ###############
 - name: "Create FIP API"
-  shell: "openstack floating ip create --description 'Tealc - {{ cluster.name }} API' -f value -c floating_ip_address {{ cluster.openstack_network }}"
+  shell: "openstack floating ip create --description 'Skodjob - {{ cluster.name }} API' -f value -c floating_ip_address {{ cluster.openstack_network }}"
   environment:
     OS_CLOUD: "{{ cluster.cloud }}"
   register: "fip_api_output"
   when: cluster.fip_api is undefined
 
 - name: "Create FIP apps"
-  shell: "openstack floating ip create --description 'Tealc - {{ cluster.name }} APPS' -f value -c floating_ip_address {{ cluster.openstack_network }}"
+  shell: "openstack floating ip create --description 'Skodjob - {{ cluster.name }} APPS' -f value -c floating_ip_address {{ cluster.openstack_network }}"
   environment:
     OS_CLOUD: "{{ cluster.cloud }}"
   register: "fip_apps_output"

diff --git a/install/roles/automation-hub/tasks/infra-setup/install/install_argo.yaml b/install/roles/automation-hub/tasks/infra-setup/install/install_argo.yaml
@@ -13,20 +13,12 @@
           project: "skodjob"
           secret: "cert-manager"
 
-- name: Create image pull secret on infra cluster
-  kubernetes.core.k8s:
-    kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
-    namespace: "{{ infra_argo_namespace }}"
-    state: present
-    verify_ssl: no
-    src: "{{ grafana_docker_secret_path }}"
-
 - name: Create Argo subscription
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     state: present
     verify_ssl: no
-    src: templates/argo/install/sub.yaml
+    template: templates/argo/install/sub.yaml
   register: argo_sub
 
 - name: Sleep for 5 seconds and continue with play
@@ -58,7 +50,7 @@
   environment:
     KUBECONFIG: "{{ kubeconfig_path }}/{{ infra_context_name }}"
 
-- name: Create Argo app
+- name: Install Argo
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     namespace: "{{ infra_argo_namespace }}"
@@ -92,7 +84,7 @@
     namespace: "{{ infra_argo_namespace }}"
     kind: Deployment
     api_version: apps/v1
-    name: tealc-gitops-server
+    name: skodjob-gitops-server
     wait: true
     verify_ssl: no
     wait_condition:
@@ -106,7 +98,7 @@
     namespace: "{{ infra_argo_namespace }}"
     kind: Deployment
     api_version: apps/v1
-    name: tealc-gitops-dex-server
+    name: skodjob-gitops-dex-server
     wait: true
     verify_ssl: no
     wait_condition:

diff --git a/install/roles/automation-hub/tasks/infra-setup/install/install_links.yaml b/install/roles/automation-hub/tasks/infra-setup/install/install_links.yaml
@@ -1,13 +1,13 @@
 ---
-- name: Delete console link for tealc applications
+- name: Delete console link for skodjob applications
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     state: absent
     template: "{{ item }}"
     verify_ssl: no
   with_fileglob: 'templates/console-link/*.j2'
 
-- name: Create console link for tealc applications
+- name: Create console link for skodjob applications
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     state: present

diff --git a/install/roles/automation-hub/tasks/infra-setup/install/install_strimzi.yaml b/install/roles/automation-hub/tasks/infra-setup/install/install_strimzi.yaml
@@ -22,7 +22,7 @@
   environment:
     KUBECONFIG: "{{ kubeconfig_path }}/{{ infra_context_name }}"
 
-- name: Add Argo Helm Repo
+- name: Add Strimzi Helm Repo
   kubernetes.core.helm_repository:
     name: strimzi
     url: https://strimzi.io/charts