Skip to content

bugfix/strimzi-kafka-operator-fix-cluster-dns - #347

Merged
Andrei Kvapil (kvaps) merged 1 commit into
cozystack:mainfrom
klinch0:patch-2
Sep 15, 2024
Merged

bugfix/strimzi-kafka-operator-fix-cluster-dns#347
Andrei Kvapil (kvaps) merged 1 commit into
cozystack:mainfrom
klinch0:patch-2

Conversation

@klinch0

@klinch0 klinch0 commented Sep 15, 2024

Copy link
Copy Markdown
Contributor

kafka zookeeper error after installation:

2024-09-15 02:44:33,289 ERROR Failed to verify hostname: kafka-service-zookeeper-2.kafka-service-zookeeper-nodes.tenant-stage.svc.cozy.local (org.apache.zookeeper.common.ZKTrustManager) [ListenerHandler-/0.0.0.0:3888]
javax.net.ssl.SSLPeerUnverifiedException: Certificate for <kafka-service-zookeeper-2.kafka-service-zookeeper-nodes.tenant-stage.svc.cozy.local> doesn't match any of the subject alternative names: [kafka-service-zookeeper-client, *.kafka-service-zookeeper-nodes.tenant-stage.svc.cluster.local, *.kafka-service-zookeeper-nodes.tenant-stage.svc, kafka-service-zookeeper-2.kafka-service-zookeeper-nodes.tenant-stage.svc, kafka-service-zookeeper-client.tenant-stage.svc.cluster.local, kafka-service-zookeeper-client.tenant-stage.svc, kafka-service-zookeeper-2, kafka-service-zookeeper-2.kafka-service-zookeeper-nodes.tenant-stage.svc.cluster.local, *.kafka-service-zookeeper-client.tenant-stage.svc, kafka-service-zookeeper-client.tenant-stage, *.kafka-service-zookeeper-client.tenant-stage.svc.cluster.local]

certs sans by default:

klin@asus:~/cozy$ openssl x509 -in zookeeper.crt -text -noout | grep -A1 "Subject Alternative Name"
            X509v3 Subject Alternative Name:
                DNS:kafka-service-zookeeper-0.kafka-service-zookeeper-nodes.tenant-stage.svc.cluster.local, DNS:*.kafka-service-zookeeper-nodes.tenant-stage.svc.cluster.local, DNS:kafka-service-zookeeper-client, DNS:kafka-service-zookeeper-0, DNS:kafka-service-zookeeper-client.tenant-stage.svc.cluster.local, DNS:kafka-service-zookeeper-client.tenant-stage.svc, DNS:kafka-service-zookeeper-client.tenant-stage, DNS:*.kafka-service-zookeeper-nodes.tenant-stage.svc, DNS:*.kafka-service-zookeeper-client.tenant-stage.svc, DNS:kafka-service-zookeeper-0.kafka-service-zookeeper-nodes.tenant-stage.svc, DNS:*.kafka-service-zookeeper-client.tenant-stage.svc.cluster.local

Summary by CodeRabbit

  • New Features
    • Introduced a new configuration option for specifying a custom DNS domain for Kubernetes services within the Kafka operator, enhancing service discovery and networking capabilities.

@coderabbitai

coderabbitai Bot commented Sep 15, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The change introduces a new configuration option in the values.yaml file for the strimzi-kafka-operator. It adds the kubernetesServiceDnsDomain key with the value cozy.local, allowing users to specify a custom DNS domain for Kubernetes services. This enhancement aims to improve service discovery and networking within the Kafka operator's deployment while maintaining the existing functionality of watching any namespace.

Changes

File Change Summary
packages/system/kafka-operator/values.yaml Added kubernetesServiceDnsDomain: cozy.local in strimzi-kafka-operator section.

Poem

In a meadow bright, where the bunnies play,
A new DNS domain has come our way! 🐇
Cozy.local, a name so sweet,
For Kafka's services, it's quite the treat!
Hop along, friends, let the data flow,
With every change, our joy will grow! 🌼


Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 06e79cd and 2c162cd.

Files selected for processing (1)
  • packages/system/kafka-operator/values.yaml (1 hunks)
Additional comments not posted (1)
packages/system/kafka-operator/values.yaml (1)

3-3: LGTM! Ensure thorough testing and alignment with network configuration.

The addition of the kubernetesServiceDnsDomain configuration option is a good approach to address the SSL certificate verification issue described in the PR objectives. Setting a custom DNS domain can help align the generated certificates with the expected subject alternative names (SANs) and resolve the Zookeeper hostname verification failure.

However, please ensure the following:

  1. Thoroughly test the change to confirm that it resolves the SSL verification issue and does not introduce any new problems.
  2. Verify that the specified DNS domain (cozy.local) is valid and aligns with the overall network configuration of your Kubernetes cluster and other components interacting with the Kafka operator.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@kvaps Andrei Kvapil (kvaps) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@kvaps
Andrei Kvapil (kvaps) merged commit b3ee563 into cozystack:main Sep 15, 2024
Andrei Kvapil (kvaps) added a commit to kvaps/cozystack that referenced this pull request May 14, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Andrei Kvapil (kvaps) added a commit to kvaps/cozystack that referenced this pull request May 14, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Andrei Kvapil (kvaps) added a commit to kvaps/cozystack that referenced this pull request May 14, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Andrei Kvapil (kvaps) added a commit to kvaps/cozystack that referenced this pull request May 14, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request May 22, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request May 22, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request May 29, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request May 29, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 4, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 4, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 5, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 5, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 8, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 8, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 8, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 8, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 9, 2026
…upstream master"

This reverts commit a1324fc.

Tracking upstream master meant ingesting PR cozystack#327 which renamed
api/v1alpha1 -> api/v1alpha2 wholesale, removed the v1alpha1 directory,
and shipped a CRD that only serves v1alpha2 with no conversion webhook.
Live tenant clusters on this dev environment (openfaas, talos1, test2)
still hold v1alpha1 KamajiControlPlane resources; flipping the CRD
would make them unmanageable without a manual migration that upstream
does not provide.

Plan instead: pin to upstream v0.19.0 (still v1alpha1) and backport the
AdditionalServicePorts patch (PR cozystack#347) as a local patch in
images/cluster-api-control-plane-provider-kamaji/patches/. Keeps the
chart's KamajiControlPlane.v1alpha1 happy until upstream adds either a
proper conversion webhook or a deprecated-served v1alpha1 alongside
v1alpha2.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
IvanHunters pushed a commit to kvaps/cozystack that referenced this pull request Jun 9, 2026
…+ patch

Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:

  - new images/cluster-api-control-plane-provider-kamaji/Dockerfile
    builds the manager from upstream v0.19.0 with patches/ applied,
    on top of distroless/static:nonroot;
  - patches/0001-backport-additional-service-ports-pr347.diff brings
    upstream PR cozystack#347 (AdditionalServicePorts) back to the v1alpha1
    schema — upstream merged the feature to v1alpha2 only, but our
    chart's KamajiControlPlane is still v1alpha1 to avoid breaking
    in-flight tenants;
  - new image and update Makefile targets handle build, manifest
    regen via kustomize, and components.gz refresh;
  - files/control-plane-components.yaml + files/components.gz
    regenerated from v0.19.0+patch via make update;
  - templates/providers.yaml + templates/configmaps.yaml renamed to
    v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).

Why v0.19.0 instead of master: upstream master (PR cozystack#327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
myasnikovdaniil added a commit that referenced this pull request Jun 22, 2026
…r (v0.19.0 + additionalServicePorts backport)

Rebuild the Kamaji control-plane provider from upstream v0.19.0 with a backport of additionalServicePorts (upstream PR #347), exposing KamajiControlPlane.spec.network.additionalServicePorts so trustd (50001/TCP) can be published on the apiserver Service. Image is built from source and pinned by digest; the 0.17-0.19 release series is registered in metadata.

Co-authored-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
myasnikovdaniil added a commit that referenced this pull request Jun 23, 2026
…r (v0.19.0 + additionalServicePorts backport)

Rebuild the Kamaji control-plane provider from upstream v0.19.0 with a backport of additionalServicePorts (upstream PR #347), exposing KamajiControlPlane.spec.network.additionalServicePorts so trustd (50001/TCP) can be published on the apiserver Service. Image is built from source and pinned by digest; the 0.17-0.19 release series is registered in metadata.

Co-authored-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants