Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .claude/plans/infrahouse-keyring-convergence.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,15 @@ Test node: `jumphost-sincere-crawdad.rmdbkn.ci-cd.infrahouse.com`

### Phase 2: Sandbox
- [x] Promote: copy the change into `environments/sandbox/modules/profile` (byte-identical to dev:
`infrahouse_repo.pp` + `files/converge-infrahouse-keyring.sh` + `base.pp` include). PR pending.
- [ ] Cut a release (merge → CD)
`infrahouse_repo.pp` + `files/converge-infrahouse-keyring.sh` + `base.pp` include).
- [x] Cut a release — PR [#279](https://github.com/infrahouse/puppet-code/pull/279) **merged** → CD.
- [ ] Watch sandbox nodes across roles: keyring converges, `apt-get update` clean, no drift
- **Regression found on `elastic_master` (sandbox `ip-10-0-2-191`):** `profile::infrahouse_repo`
is in `base` (every node) and `ensure_packages`'d `ca-certificates`, which collided with
`profile::elastic::tls`'s **native** `package { 'ca-certificates' }` → duplicate declaration,
catalog failed. Fix: `base`/`infrahouse_repo` now **owns** `ca-certificates` (it's a fleet-wide
TLS need); removed the native block from `elastic::tls`, which just `require`s it. Dev never hit
it (only jumphost was tested). Applied to dev + sandbox; global gets it with the Phase-3 promo.

### Phase 3: Production (global modules)
- [ ] Promote: move the change into global `modules/profile` (production has no env-local override)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
puppet-code (0.1.0-1build313) noble; urgency=medium

* commit event. see changes history in git log

-- root <packager@infrahouse.com> Sat, 04 Jul 2026 02:14:39 +0000

puppet-code (0.1.0-1build312) noble; urgency=medium

* commit event. see changes history in git log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@
mode => '0600',
require => Exec[generate_node_pem],
}
# Let's encrypt root certificates
package {'ca-certificates':
ensure => present,
}
# Let's encrypt root certificates. The ca-certificates package (which provides
# the Mozilla/ISRG roots linked below) is installed fleet-wide by profile::base
# -> profile::infrahouse_repo; the file resources below just require it.
file { '/etc/elasticsearch/tls/ISRG_Root_X1.crt':
ensure => present,
owner => 'elasticsearch',
Expand Down
7 changes: 3 additions & 4 deletions environments/sandbox/modules/profile/manifests/elastic/tls.pp
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@
mode => '0600',
require => Exec[generate_node_pem],
}
# Let's encrypt root certificates
package {'ca-certificates':
ensure => present,
}
# Let's encrypt root certificates. The ca-certificates package (which provides
# the Mozilla/ISRG roots linked below) is installed fleet-wide by profile::base
# -> profile::infrahouse_repo; the file resources below just require it.
file { '/etc/elasticsearch/tls/ISRG_Root_X1.crt':
ensure => present,
owner => 'elasticsearch',
Expand Down
Loading