fix(kebernetes): Apply fixes listed in issues #109

Merged
jon_nfc merged 25 commits from fixes into development 2024-07-08 02:02:30 +00:00
jon_nfc commented 2024-07-06 03:30:19 +00:00 (Migrated from gitlab.com)

📚 Summary

👷 Tasks

  • Add your tasks here if required (delete)
### :books: Summary <!-- your summary here emojis ref: https://github.com/yodamad/gitlab-emoji --> ### :link: Links / References <!-- using a list as any links to other references or links as required. if relevent, describe the link/reference --> - !74 Original MR from forked repo that thanks to gitlab being shit and limiting CI, that MR is closed in favour of this mr so that work can continue. - #32 - #33 ### :construction_worker: Tasks - [ ] Add your tasks here if required (delete) <!-- dont remove tasks below strike through including the checkbox by enclosing in double tidle '~~' --> - [ ] Playbook Update This collection has a [corresponding playbook](https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks/-/blob/development/role.yaml) that may need to be updated (Ansible Role), specifically [Role Validation](https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks/-/blob/development/tasks/role/validation/nfc_kubernetes.yaml). - [ ] NetBox Rendered Config Update This Collection has a [NetBox Rendered Config template](https://gitlab.com/nofusscomputing/infrastructure/configuration-management/netbox/-/blob/development/templates/cluster.json.j2) that may need to be updated. Specifically Section `cluster.type == 'kubernetes'`
jon_nfc commented 2024-07-06 03:30:19 +00:00 (Migrated from gitlab.com)

added 15m of time spent

added 15m of time spent
jon_nfc commented 2024-07-06 03:30:19 +00:00 (Migrated from gitlab.com)

assigned to @jasonpage.tas

assigned to @jasonpage.tas
jon_nfc (Migrated from gitlab.com) approved these changes 2024-07-06 03:30:19 +00:00
jon_nfc commented 2024-07-06 03:30:54 +00:00 (Migrated from gitlab.com)

requested review from @jon_nfc

requested review from @jon_nfc
jon_nfc commented 2024-07-06 03:31:38 +00:00 (Migrated from gitlab.com)

mentioned in merge request !74

mentioned in merge request !74
jon_nfc commented 2024-07-06 03:40:01 +00:00 (Migrated from gitlab.com)

added 10m of time spent

added 10m of time spent
jasonpage.tas commented 2024-07-06 03:40:47 +00:00 (Migrated from gitlab.com)

approved this merge request

approved this merge request
jasonpage.tas commented 2024-07-06 03:40:52 +00:00 (Migrated from gitlab.com)

unapproved this merge request

unapproved this merge request
jon_nfc commented 2024-07-06 04:00:27 +00:00 (Migrated from gitlab.com)

added 10m of time spent

added 10m of time spent
jasonpage.tas commented 2024-07-06 04:20:07 +00:00 (Migrated from gitlab.com)

mentioned in commit 8217889910

mentioned in commit 82178899102c5c2f134bd2d4653e6d6dda7ff4ee
jasonpage.tas commented 2024-07-06 04:20:08 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 82178899 - test(kubernetes_role): set not nfc_role_kubernetes_cluster_upgraded |...

Compare with previous version

added 1 commit <ul><li>82178899 - test(kubernetes_role): set not nfc_role_kubernetes_cluster_upgraded |...</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057158436&start_sha=d59f20077ecbb58eab4a7abf17d2cb39ff442120)
jasonpage.tas commented 2024-07-06 04:39:05 +00:00 (Migrated from gitlab.com)

mentioned in commit 536bab4ce2

mentioned in commit 536bab4ce27888cf252fa695727fafa3e67e4ae3
jasonpage.tas commented 2024-07-06 04:39:05 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 536bab4c - fix(kubernetes_role): undo previous change

Compare with previous version

added 1 commit <ul><li>536bab4c - fix(kubernetes_role): undo previous change</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057160207&start_sha=82178899102c5c2f134bd2d4653e6d6dda7ff4ee)
jasonpage.tas commented 2024-07-06 05:00:04 +00:00 (Migrated from gitlab.com)

mentioned in commit a8ddcad1a0

mentioned in commit a8ddcad1a012bf16780c1f4198d6d378217c5a36
jasonpage.tas commented 2024-07-06 05:00:04 +00:00 (Migrated from gitlab.com)

added 1 commit

  • a8ddcad1 - fix(kubernetes_role): remove not nfc_role_kubernetes_cluster_upgraded |...

Compare with previous version

added 1 commit <ul><li>a8ddcad1 - fix(kubernetes_role): remove not nfc_role_kubernetes_cluster_upgraded |...</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057161774&start_sha=536bab4ce27888cf252fa695727fafa3e67e4ae3)
jasonpage.tas commented 2024-07-06 05:21:48 +00:00 (Migrated from gitlab.com)

I'm going around in circles. Stopping for the day as not getting anywhere.

I'm going around in circles. Stopping for the day as not getting anywhere.
jasonpage.tas commented 2024-07-06 05:21:49 +00:00 (Migrated from gitlab.com)

added 3h of time spent

added 3h of time spent
jasonpage.tas commented 2024-07-07 01:05:21 +00:00 (Migrated from gitlab.com)

mentioned in commit 6bd8d27cfd

mentioned in commit 6bd8d27cfdaddf037ad71891c981708ac8d631cf
jasonpage.tas commented 2024-07-07 01:05:22 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 6bd8d27c - fix(kubernetes_role): set server var -> "https://" +...

Compare with previous version

added 1 commit <ul><li>6bd8d27c - fix(kubernetes_role): set server var -&gt; &quot;https://&quot; +...</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057276194&start_sha=a8ddcad1a012bf16780c1f4198d6d378217c5a36)
jasonpage.tas commented 2024-07-07 04:41:45 +00:00 (Migrated from gitlab.com)

mentioned in commit 8c1223769d

mentioned in commit 8c1223769d75a6a5c4a021fbd27524c6d3c3cf65
jasonpage.tas commented 2024-07-07 04:41:46 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 8c122376 - fix(kubernetes_role): get prime hostname

Compare with previous version

added 1 commit <ul><li>8c122376 - fix(kubernetes_role): get prime hostname</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057292906&start_sha=6bd8d27cfdaddf037ad71891c981708ac8d631cf)
jasonpage.tas commented 2024-07-07 04:54:01 +00:00 (Migrated from gitlab.com)

mentioned in commit 860addad4d

mentioned in commit 860addad4d0da934c3c53882a3eafd0d53cff195
jasonpage.tas commented 2024-07-07 04:54:01 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 860addad - fix(kubernetes_role): Change "https://" + hostvars[ns.prime_name].ansible_host...

Compare with previous version

added 1 commit <ul><li>860addad - fix(kubernetes_role): Change &quot;https://&quot; + hostvars[ns.prime_name].ansible_host...</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057293546&start_sha=8c1223769d75a6a5c4a021fbd27524c6d3c3cf65)
jasonpage.tas commented 2024-07-07 05:04:01 +00:00 (Migrated from gitlab.com)

mentioned in commit 202e92a90b

mentioned in commit 202e92a90bf78121f963ebdc3146105de81614e3
jasonpage.tas commented 2024-07-07 05:04:04 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 202e92a9 - fix(kubernetes_role): delete leftover ]

Compare with previous version

added 1 commit <ul><li>202e92a9 - fix(kubernetes_role): delete leftover ]</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057294698&start_sha=860addad4d0da934c3c53882a3eafd0d53cff195)
jasonpage.tas commented 2024-07-07 05:44:15 +00:00 (Migrated from gitlab.com)

@jon_nfc pipelines passed but I am unable to determine if the changes have worked. Can you code review and make any suggestions.

@jon_nfc pipelines passed but I am unable to determine if the changes have worked. Can you code review and make any suggestions.
jasonpage.tas commented 2024-07-07 05:44:15 +00:00 (Migrated from gitlab.com)

added 4h of time spent

added 4h of time spent
jon_nfc commented 2024-07-07 06:41:00 +00:00 (Migrated from gitlab.com)
      {%- if values.nfc_role_kubernetes_node_prime ==true -%}

        {%- set ns.prime_name = hostname -%}

      {%- endif -%}

dont forget to clean up the whitespace with the - symbol

```suggestion:-2+0 {%- if values.nfc_role_kubernetes_node_prime ==true -%} {%- set ns.prime_name = hostname -%} {%- endif -%} ``` dont forget to clean up the whitespace with the `-` symbol
jon_nfc commented 2024-07-07 06:41:01 +00:00 (Migrated from gitlab.com)
    {%- set ns = namespace(prime_name) -%}
```suggestion:-0+0 {%- set ns = namespace(prime_name) -%} ```
jon_nfc commented 2024-07-07 06:41:02 +00:00 (Migrated from gitlab.com)
    {%- for hostname, values in hostvars.iteritems() -%}
```suggestion:-0+0 {%- for hostname, values in hostvars.iteritems() -%} ```
jon_nfc commented 2024-07-07 06:41:02 +00:00 (Migrated from gitlab.com)
    {%- endfor -%}
```suggestion:-0+0 {%- endfor -%} ```
jon_nfc commented 2024-07-07 06:41:02 +00:00 (Migrated from gitlab.com)
  (
    nfc_role_kubernetes_master
      or
    nfc_role_kubernetes_prime | default(true) | bool
  )
    and
  not nfc_role_kubernetes_worker
```suggestion:-2+0 ( nfc_role_kubernetes_master or nfc_role_kubernetes_prime | default(true) | bool ) and not nfc_role_kubernetes_worker ```
jon_nfc commented 2024-07-07 06:41:03 +00:00 (Migrated from gitlab.com)
    nfc_role_kubernetes_prime | default(true) | bool
      and
    not node_k3s.installed
      and
    not nfc_role_kubernetes_worker

```suggestion:-2+0 nfc_role_kubernetes_prime | default(true) | bool and not node_k3s.installed and not nfc_role_kubernetes_worker ```
jon_nfc commented 2024-07-07 06:41:03 +00:00 (Migrated from gitlab.com)
  nfc_role_kubernetes_prime | default(true) | bool
    and
  not nfc_role_kubernetes_worker
```suggestion:-0+0 nfc_role_kubernetes_prime | default(true) | bool and not nfc_role_kubernetes_worker ```
jon_nfc commented 2024-07-07 06:41:04 +00:00 (Migrated from gitlab.com)

minor changes required:

  • jinja whitespace cleanup
  • ensuring that vars destined for a prime node are not unintentionally applied to a slave node.
minor changes required: - jinja whitespace cleanup - ensuring that vars destined for a prime node are not unintentionally applied to a slave node.
jon_nfc commented 2024-07-07 06:41:04 +00:00 (Migrated from gitlab.com)

added 10m of time spent

added 10m of time spent
jon_nfc commented 2024-07-07 06:41:04 +00:00 (Migrated from gitlab.com)

requested changes

requested changes
jasonpage.tas commented 2024-07-08 00:43:34 +00:00 (Migrated from gitlab.com)

mentioned in commit 98b6442bf8

mentioned in commit 98b6442bf806ac01320bd252beb97079066c4d89
jasonpage.tas commented 2024-07-08 00:43:35 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 98b6442b - fix(kubernetes_roles): clean up white space

Compare with previous version

added 1 commit <ul><li>98b6442b - fix(kubernetes_roles): clean up white space</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422279&start_sha=202e92a90bf78121f963ebdc3146105de81614e3)
jasonpage.tas commented 2024-07-08 00:43:52 +00:00 (Migrated from gitlab.com)

mentioned in commit 6275dde9e3

mentioned in commit 6275dde9e3fbb3ebaea2bd6b7542fadc2816be84
jasonpage.tas commented 2024-07-08 00:43:53 +00:00 (Migrated from gitlab.com)

changed this line in version 10 of the diff

changed this line in [version 10 of the diff](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422317&start_sha=98b6442bf806ac01320bd252beb97079066c4d89#cce8a4eb24927eec9e1e73ced526440013e017c5_204_204)
jasonpage.tas commented 2024-07-08 00:43:53 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 6275dde9 - fix(kubernetes_roles): clean up white space

Compare with previous version

added 1 commit <ul><li>6275dde9 - fix(kubernetes_roles): clean up white space</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422317&start_sha=98b6442bf806ac01320bd252beb97079066c4d89)
jasonpage.tas commented 2024-07-08 00:44:07 +00:00 (Migrated from gitlab.com)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422359&start_sha=6275dde9e3fbb3ebaea2bd6b7542fadc2816be84#cce8a4eb24927eec9e1e73ced526440013e017c5_206_206)
jasonpage.tas commented 2024-07-08 00:44:07 +00:00 (Migrated from gitlab.com)

mentioned in commit 6893164f90

mentioned in commit 6893164f90431c0163c0b269d25438b75c67289b
jasonpage.tas commented 2024-07-08 00:44:08 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 6893164f - fix(kubernetes_roles): clean up white space

Compare with previous version

added 1 commit <ul><li>6893164f - fix(kubernetes_roles): clean up white space</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422359&start_sha=6275dde9e3fbb3ebaea2bd6b7542fadc2816be84)
jasonpage.tas commented 2024-07-08 00:44:16 +00:00 (Migrated from gitlab.com)

mentioned in commit 115755ad54

mentioned in commit 115755ad54a9c9c913c9d65c2ce78d64e8f7b7af
jasonpage.tas commented 2024-07-08 00:44:17 +00:00 (Migrated from gitlab.com)

changed this line in version 12 of the diff

changed this line in [version 12 of the diff](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422389&start_sha=6893164f90431c0163c0b269d25438b75c67289b#cce8a4eb24927eec9e1e73ced526440013e017c5_214_214)
jasonpage.tas commented 2024-07-08 00:44:19 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 115755ad - fix(kubernetes_roles): clean up white space

Compare with previous version

added 1 commit <ul><li>115755ad - fix(kubernetes_roles): clean up white space</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422389&start_sha=6893164f90431c0163c0b269d25438b75c67289b)
jasonpage.tas commented 2024-07-08 00:45:43 +00:00 (Migrated from gitlab.com)

mentioned in commit cf63ec5543

mentioned in commit cf63ec554396902f9926c716ed1ae601d7a316a9
jasonpage.tas commented 2024-07-08 00:45:45 +00:00 (Migrated from gitlab.com)

changed this line in version 13 of the diff

changed this line in [version 13 of the diff](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422624&start_sha=115755ad54a9c9c913c9d65c2ce78d64e8f7b7af#cce8a4eb24927eec9e1e73ced526440013e017c5_256_254)
jasonpage.tas commented 2024-07-08 00:45:46 +00:00 (Migrated from gitlab.com)

added 1 commit

  • cf63ec55 - fix(kubernetes_roles): conditional checks for prime

Compare with previous version

added 1 commit <ul><li>cf63ec55 - fix(kubernetes_roles): conditional checks for prime</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422624&start_sha=115755ad54a9c9c913c9d65c2ce78d64e8f7b7af)
jasonpage.tas commented 2024-07-08 00:45:55 +00:00 (Migrated from gitlab.com)

mentioned in commit 425e05de37

mentioned in commit 425e05de3763bd86489ec04a158c3f4997dbc5a7
jasonpage.tas commented 2024-07-08 00:45:57 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 425e05de - fix(kubernetes_roles): conditional checks for prime

Compare with previous version

added 1 commit <ul><li>425e05de - fix(kubernetes_roles): conditional checks for prime</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422664&start_sha=cf63ec554396902f9926c716ed1ae601d7a316a9)
jasonpage.tas commented 2024-07-08 00:46:09 +00:00 (Migrated from gitlab.com)

resolved all threads

resolved all threads
jasonpage.tas commented 2024-07-08 00:46:09 +00:00 (Migrated from gitlab.com)

mentioned in commit cba13dd8a3

mentioned in commit cba13dd8a361d4717ee7205b7fe296d0a56cb5f9
jasonpage.tas commented 2024-07-08 00:46:10 +00:00 (Migrated from gitlab.com)

added 1 commit

  • cba13dd8 - fix(kubernetes_roles): conditional checks for prime

Compare with previous version

added 1 commit <ul><li>cba13dd8 - fix(kubernetes_roles): conditional checks for prime</li></ul> [Compare with previous version](/nofusscomputing/projects/ansible/collections/kubernetes/-/merge_requests/75/diffs?diff_id=1057422692&start_sha=425e05de3763bd86489ec04a158c3f4997dbc5a7)
jasonpage.tas commented 2024-07-08 00:48:11 +00:00 (Migrated from gitlab.com)

requested review from @jon_nfc

requested review from @jon_nfc
jon_nfc commented 2024-07-08 02:02:29 +00:00 (Migrated from gitlab.com)

added 2m of time spent

added 2m of time spent
jon_nfc commented 2024-07-08 02:02:31 +00:00 (Migrated from gitlab.com)

mentioned in commit f3f2769f0a

mentioned in commit f3f2769f0afcd8edc2fe8a9e41496b1cdad3af43
jon_nfc commented 2024-07-08 02:02:31 +00:00 (Migrated from gitlab.com)

approved this merge request

approved this merge request
jon_nfc (Migrated from gitlab.com) merged commit f3f2769f0a into development 2024-07-08 02:02:31 +00:00
nfc_bot commented 2024-07-08 07:48:03 +00:00 (Migrated from gitlab.com)

mentioned in commit b47b868f43

mentioned in commit b47b868f43fbc756d24f182b43e5c4a972173452
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: ansible-collections/kubernetes#109
No description provided.