From 29bd12d52d45b4d624ec9c33e6452fefeee93cca Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 30 Dec 2025 11:56:59 +0100 Subject: [PATCH] [installer,dx] Rename cozypkg to cozyhr (#1763) Signed-off-by: Andrei Kvapil ## What this PR does This PR renames cozypkg to cozyhr https://github.com/cozystack/cozyhr ### Release note ```release-note [installer,dx] Rename cozypkg to cozyhr ``` --- docs/agents/changelog.md | 14 +++++++------- docs/agents/overview.md | 2 +- hack/check-optional-repos.sh | 2 +- packages/core/flux-aio/Makefile | 6 +++--- packages/core/installer/Makefile | 6 +++--- .../core/installer/images/cozystack/Dockerfile | 2 +- packages/core/platform/Makefile | 10 +++++----- .../core/testing/images/e2e-sandbox/Dockerfile | 4 ++-- packages/system/fluxcd-operator/Makefile | 2 +- packages/system/fluxcd/Makefile | 2 +- scripts/migrations/15 | 2 +- scripts/migrations/20 | 6 +++--- scripts/package.mk | 12 ++++++------ 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/agents/changelog.md b/docs/agents/changelog.md index 02cd2eab..feb70597 100644 --- a/docs/agents/changelog.md +++ b/docs/agents/changelog.md @@ -22,7 +22,7 @@ When the user asks to generate a changelog, follow these steps in the specified - [ ] Step 5: Get the list of commits for the release period - [ ] Step 6: Check additional repositories (website is REQUIRED, optional repos if tags exist) - [ ] **MANDATORY**: Check website repository for documentation changes WITH authors and PR links via GitHub CLI - - [ ] **MANDATORY**: Check ALL optional repositories (talm, boot-to-talos, cozypkg, cozy-proxy) for tags during release period + - [ ] **MANDATORY**: Check ALL optional repositories (talm, boot-to-talos, cozyhr, cozy-proxy) for tags during release period - [ ] **MANDATORY**: For ALL commits from additional repos, get GitHub username via CLI, prioritizing PR author over commit author. - [ ] Step 7: Analyze commits (extract PR numbers, authors, user impact) - [ ] **MANDATORY**: For EVERY PR in main repo, get PR author via `gh pr view --json author --jq .author.login` (do NOT skip this step) @@ -146,7 +146,7 @@ Cozystack release may include changes from related repositories. Check and inclu **Optional repositories (MUST check ALL of them for tags during release period):** - [https://github.com/cozystack/talm](https://github.com/cozystack/talm) - [https://github.com/cozystack/boot-to-talos](https://github.com/cozystack/boot-to-talos) -- [https://github.com/cozystack/cozypkg](https://github.com/cozystack/cozypkg) +- [https://github.com/cozystack/cozyhr](https://github.com/cozystack/cozyhr) - [https://github.com/cozystack/cozy-proxy](https://github.com/cozystack/cozy-proxy) **⚠️ IMPORTANT**: You MUST check ALL optional repositories for tags created during the release period. Do NOT skip this step even if you think there might not be any tags. Use the process below to verify. @@ -195,7 +195,7 @@ Cozystack release may include changes from related repositories. Check and inclu 3. **For optional repositories, check if tags exist during release period:** - **⚠️ MANDATORY: You MUST check ALL optional repositories (talm, boot-to-talos, cozypkg, cozy-proxy). Do NOT skip any repository!** + **⚠️ MANDATORY: You MUST check ALL optional repositories (talm, boot-to-talos, cozyhr, cozy-proxy). Do NOT skip any repository!** **Use the helper script:** ```bash @@ -208,7 +208,7 @@ Cozystack release may include changes from related repositories. Check and inclu ``` The script will: - - Check ALL optional repositories (talm, boot-to-talos, cozypkg, cozy-proxy) + - Check ALL optional repositories (talm, boot-to-talos, cozyhr, cozy-proxy) - Look for tags created during the release period - Get commits between tags (if tags exist) or by date range (if no tags) - Extract PR numbers from commit messages @@ -569,7 +569,7 @@ Create a new changelog file in the format matching previous versions: - [ ] Step 5 completed: **ALL commits included** (including merge commits and backports) - do not skip any commits - [ ] Step 5 completed: **Backports identified and handled correctly** - original PR author used, both original and backport PR numbers included - [ ] Step 6 completed: Website repository checked for documentation changes WITH authors and PR links via GitHub CLI -- [ ] Step 6 completed: **ALL** optional repositories (talm, boot-to-talos, cozypkg, cozy-proxy) checked for tags during release period +- [ ] Step 6 completed: **ALL** optional repositories (talm, boot-to-talos, cozyhr, cozy-proxy) checked for tags during release period - [ ] Step 6 completed: For ALL commits from additional repos, GitHub username obtained via GitHub CLI (not skipped). For commits with PR numbers, PR author used via `gh pr view` (not commit author) - [ ] Step 7 completed: For EVERY PR in main repo (including backports), PR author obtained via `gh pr view --json author --jq .author.login` (not skipped or assumed). Commit author NOT used - always use PR author - [ ] Step 7 completed: **Backports verified** - for each backport PR, original PR found and original PR author used in changelog @@ -628,7 +628,7 @@ Save the changelog to file `docs/changelogs/v.md` according to the vers - **Additional repositories (Step 6) - MANDATORY**: - **⚠️ CRITICAL**: Always check the **website** repository for documentation changes during the release period. This is a required step and MUST NOT be skipped. - - **⚠️ CRITICAL**: You MUST check ALL optional repositories (talm, boot-to-talos, cozypkg, cozy-proxy) for tags during the release period. Do NOT skip any repository even if you think there might not be tags. + - **⚠️ CRITICAL**: You MUST check ALL optional repositories (talm, boot-to-talos, cozyhr, cozy-proxy) for tags during the release period. Do NOT skip any repository even if you think there might not be tags. - **CRITICAL**: For ALL entries from additional repositories (website and optional), you MUST: - **MANDATORY**: Extract PR number from commit message first - **MANDATORY**: For commits with PR numbers, ALWAYS use `gh pr view --repo cozystack/ --json author --jq .author.login` to get PR author (not commit author) @@ -637,7 +637,7 @@ Save the changelog to file `docs/changelogs/v.md` according to the vers - **MANDATORY**: Do NOT use commit author for PRs - always use PR author - Include PR link or commit hash reference - Format: `* **[repo] Description**: details ([**@username**](https://github.com/username) in cozystack/repo#123)` - - For **optional repositories** (talm, boot-to-talos, cozypkg, cozy-proxy), you MUST check ALL of them for tags during the release period. Use the loop provided in Step 6 to check each repository systematically. + - For **optional repositories** (talm, boot-to-talos, cozyhr, cozy-proxy), you MUST check ALL of them for tags during the release period. Use the loop provided in Step 6 to check each repository systematically. - When including changes from additional repositories, use the format: `[repo-name] Description` and link to the repository's PR/issue if available - **Prefer PR numbers over commit hashes**: For commits from additional repositories, extract PR number from commit message using GitHub API. Use PR format (`cozystack/website#123`) instead of commit hash (`cozystack/website@abc1234`) when available - **Never add entries without author and PR/commit reference**: Every entry from additional repositories must have both author and link diff --git a/docs/agents/overview.md b/docs/agents/overview.md index 50b9a73c..b6d69e68 100644 --- a/docs/agents/overview.md +++ b/docs/agents/overview.md @@ -10,7 +10,7 @@ Cozystack is an open-source Kubernetes-based platform and framework for building - **Multi-tenancy**: Full isolation and self-service for tenants - **GitOps-driven**: FluxCD-based continuous delivery - **Modular Architecture**: Extensible with custom packages and services -- **Developer Experience**: Simplified local development with cozypkg tool +- **Developer Experience**: Simplified local development with cozyhr tool The platform exposes infrastructure services via the Kubernetes API with ready-made configs, built-in monitoring, and alerts. diff --git a/hack/check-optional-repos.sh b/hack/check-optional-repos.sh index 4bfdbd3a..1faa6d2c 100755 --- a/hack/check-optional-repos.sh +++ b/hack/check-optional-repos.sh @@ -48,7 +48,7 @@ echo " End: $RELEASE_END" echo "" # Loop through ALL optional repositories -for repo_name in talm boot-to-talos cozypkg cozy-proxy; do +for repo_name in talm boot-to-talos cozyhr cozy-proxy; do echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" echo "Checking repository: $repo_name" echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" diff --git a/packages/core/flux-aio/Makefile b/packages/core/flux-aio/Makefile index d50f317d..a5f36c82 100644 --- a/packages/core/flux-aio/Makefile +++ b/packages/core/flux-aio/Makefile @@ -4,13 +4,13 @@ NAMESPACE=cozy-$(NAME) include ../../../scripts/common-envs.mk show: - cozypkg show -n $(NAMESPACE) $(NAME) --plain + cozyhr show -n $(NAMESPACE) $(NAME) --plain apply: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- --server-side --force-conflicts + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- --server-side --force-conflicts diff: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f- + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f- update: timoni bundle build -f flux-aio.cue > templates/fluxcd.yaml diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 12a3e333..7c264018 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -7,13 +7,13 @@ pre-checks: ../../../hack/pre-checks.sh show: - cozypkg show -n $(NAMESPACE) $(NAME) --plain + cozyhr show -n $(NAMESPACE) $(NAME) --plain apply: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- diff: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f - + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f - image: pre-checks image-cozystack diff --git a/packages/core/installer/images/cozystack/Dockerfile b/packages/core/installer/images/cozystack/Dockerfile index beeed70b..8e1ae219 100644 --- a/packages/core/installer/images/cozystack/Dockerfile +++ b/packages/core/installer/images/cozystack/Dockerfile @@ -28,7 +28,7 @@ RUN go mod download FROM alpine:3.22 -RUN wget -O- https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.2.0 +RUN wget -O- https://github.com/cozystack/cozyhr/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.5.0 RUN apk add --no-cache make kubectl helm coreutils git jq openssl diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile index 5c0b4786..2ea59153 100644 --- a/packages/core/platform/Makefile +++ b/packages/core/platform/Makefile @@ -4,22 +4,22 @@ NAMESPACE=cozy-system include ../../../scripts/common-envs.mk show: - cozypkg show -n $(NAMESPACE) $(NAME) --plain + cozyhr show -n $(NAMESPACE) $(NAME) --plain apply: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl apply -f- kubectl delete helmreleases.helm.toolkit.fluxcd.io -l cozystack.io/marked-for-deletion=true -A reconcile: apply namespaces-show: - cozypkg show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml + cozyhr show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml namespaces-apply: - cozypkg show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml | kubectl apply -f- + cozyhr show -n $(NAMESPACE) $(NAME) --plain -s templates/namespaces.yaml | kubectl apply -f- diff: - cozypkg show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f- + cozyhr show -n $(NAMESPACE) $(NAME) --plain | kubectl diff -f- image: image-assets image-assets: diff --git a/packages/core/testing/images/e2e-sandbox/Dockerfile b/packages/core/testing/images/e2e-sandbox/Dockerfile index 069a1905..ce6cabdd 100755 --- a/packages/core/testing/images/e2e-sandbox/Dockerfile +++ b/packages/core/testing/images/e2e-sandbox/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.04 ARG KUBECTL_VERSION=1.33.2 ARG TALOSCTL_VERSION=1.10.4 ARG HELM_VERSION=3.18.3 -ARG COZYPKG_VERSION=1.1.0 +ARG COZYHR_VERSION=1.5.0 ARG TARGETOS ARG TARGETARCH @@ -18,7 +18,7 @@ RUN curl -sSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm RUN curl -sSL "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_${TARGETOS}_${TARGETARCH}" -o /usr/local/bin/yq \ && chmod +x /usr/local/bin/yq RUN curl -sSL "https://fluxcd.io/install.sh" | bash -RUN curl -sSL "https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh" | sh -s -- -v "${COZYPKG_VERSION}" +RUN curl -sSL "https://github.com/cozystack/cozyhr/raw/refs/heads/main/hack/install.sh" | sh -s -- -v "${COZYHR_VERSION}" RUN curl https://dl.min.io/client/mc/release/${TARGETOS}-${TARGETARCH}/mc --create-dirs -o /usr/local/bin/mc \ && chmod +x /usr/local/bin/mc COPY entrypoint.sh /usr/local/bin/entrypoint.sh diff --git a/packages/system/fluxcd-operator/Makefile b/packages/system/fluxcd-operator/Makefile index 84ffc6fe..a603b85f 100644 --- a/packages/system/fluxcd-operator/Makefile +++ b/packages/system/fluxcd-operator/Makefile @@ -4,7 +4,7 @@ NAMESPACE=cozy-fluxcd include ../../../scripts/package.mk apply-locally: - cozypkg apply --plain -n $(NAMESPACE) $(NAME) + cozyhr apply --plain -n $(NAMESPACE) $(NAME) update: rm -rf charts diff --git a/packages/system/fluxcd/Makefile b/packages/system/fluxcd/Makefile index b5af8680..2c88b52d 100644 --- a/packages/system/fluxcd/Makefile +++ b/packages/system/fluxcd/Makefile @@ -4,7 +4,7 @@ NAMESPACE=cozy-$(NAME) include ../../../scripts/package.mk apply-locally: - cozypkg apply --plain -n $(NAMESPACE) $(NAME) + cozyhr apply --plain -n $(NAMESPACE) $(NAME) update: rm -rf charts diff --git a/scripts/migrations/15 b/scripts/migrations/15 index e0d78cfb..fe5c69a9 100755 --- a/scripts/migrations/15 +++ b/scripts/migrations/15 @@ -21,7 +21,7 @@ kubectl get kuberneteses.apps.cozystack.io -A --no-headers --output=custom-colum done if kubectl get helmrelease kamaji -n cozy-kamaji; then - cozypkg reconcile kamaji -n cozy-kamaji --force + cozyhr reconcile kamaji -n cozy-kamaji --force fi # Write version to cozystack-version config diff --git a/scripts/migrations/20 b/scripts/migrations/20 index 2b2e1530..a27464ac 100755 --- a/scripts/migrations/20 +++ b/scripts/migrations/20 @@ -22,9 +22,9 @@ done kubectl delete helmrelease -n cozy-dashboard dashboard --ignore-not-found sleep 5 -cozypkg -n cozy-system -C packages/system/cozystack-resource-definition-crd apply cozystack-resource-definition-crd --plain -cozypkg -n cozy-system -C packages/system/cozystack-resource-definitions apply cozystack-resource-definitions --plain -cozypkg -n cozy-system -C packages/system/cozystack-api apply cozystack-api --plain +cozyhr -n cozy-system -C packages/system/cozystack-resource-definition-crd apply cozystack-resource-definition-crd --plain +cozyhr -n cozy-system -C packages/system/cozystack-resource-definitions apply cozystack-resource-definitions --plain +cozyhr -n cozy-system -C packages/system/cozystack-api apply cozystack-api --plain if kubectl get ds cozystack-api -n cozy-system >/dev/null 2>&1; then echo "Waiting for cozystack-api daemonset" kubectl rollout status ds/cozystack-api -n cozy-system --timeout=5m || exit 1 diff --git a/scripts/package.mk b/scripts/package.mk index 6940ad72..cf0f5b72 100644 --- a/scripts/package.mk +++ b/scripts/package.mk @@ -5,22 +5,22 @@ help: ## Show this help. @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) show: check ## Show output of rendered templates - cozypkg show -n $(NAMESPACE) $(NAME) + cozyhr show -n $(NAMESPACE) $(NAME) apply: check suspend ## Apply Helm release to a Kubernetes cluster - cozypkg apply -n $(NAMESPACE) $(NAME) + cozyhr apply -n $(NAMESPACE) $(NAME) diff: check ## Diff Helm release against objects in a Kubernetes cluster - cozypkg diff -n $(NAMESPACE) $(NAME) + cozyhr diff -n $(NAMESPACE) $(NAME) suspend: check ## Suspend reconciliation for an existing Helm release - cozypkg suspend -n $(NAMESPACE) $(NAME) + cozyhr suspend -n $(NAMESPACE) $(NAME) resume: check ## Resume reconciliation for an existing Helm release - cozypkg resume -n $(NAMESPACE) $(NAME) + cozyhr resume -n $(NAMESPACE) $(NAME) delete: check suspend ## Delete Helm release from a Kubernetes cluster - cozypkg delete -n $(NAMESPACE) $(NAME) + cozyhr delete -n $(NAMESPACE) $(NAME) check: @if [ -z "$(NAME)" ]; then echo "env NAME is not set!" >&2; exit 1; fi