feat: DotnetWindowsInjector

.github/draft-image-release-config.yml

@@ -52,4 +52,4 @@ version-resolver:
 template: |
   $CHANGES
 
-  **Full Changelog**: https://github.com/newrelic/k8s-agents-operator/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  **Full Changelog**: https://github.com/newrelic-experimental/k8s-agents-operator-windows/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION

.github/workflows/ci.yml

@@ -113,12 +113,12 @@ jobs:
         run: |
           make test
 
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        with:
-          files: ./tmp/cover.out
+      # - name: Upload coverage reports to Codecov
+      #   uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      #   env:
+      #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      #   with:
+      #     files: ./tmp/cover.out
 
   e2e-tests:
     name: E2E tests
@@ -154,8 +154,7 @@ jobs:
         id: metadata
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
         with:
-          images: |
-            newrelic/k8s-agents-operator
+          images: ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows
           tags: |
             # reflects the last commit of the active branch
             type=edge
@@ -166,12 +165,13 @@ jobs:
             # push tag event
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Login to Docker Hub
+      - name: Login to GitHub Package Registry
         if: github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/heads/renovate')
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.K8S_AGENTS_DOCKERHUB_USERNAME }}
-          password: ${{ secrets.K8S_AGENTS_DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.K8S_AGENTS_GHCR_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

.github/workflows/publish-newrelic-instrumentation-dotnet-windows.yml

@@ -0,0 +1,106 @@
+name: "Publish Dotnet Newrelic-Instrumentation for Windows"
+
+on:
+  push:
+    paths:
+      - 'src/apm/dotnet_windows/**'
+      - '.github/workflows/publish-newrelic-instrumentation-dotnet-windows.yml'
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'src/apm/dotnet_windows/**'
+      - '.github/workflows/publish-newrelic-instrumentation-dotnet-windows.yml'
+  workflow_dispatch:
+
+jobs:
+  read-version:
+    name: Read Version
+    runs-on: ubuntu-latest
+    outputs:
+      VERSION: ${{ steps.get_version.outputs.VERSION }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Read version
+        id: get_version
+        run: |
+          VERSION=$(cat src/apm/dotnet_windows/version.txt)
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+
+  build-publish-containers:
+    name: Build and Publish Containers
+    runs-on: ${{ matrix.os }}
+    needs: read-version
+    strategy:
+      max-parallel: 2
+      matrix:
+        os: [windows-2019, windows-2022]
+        include:
+          - os: windows-2019
+            base: ltsc2019
+            file: src/apm/dotnet_windows/Dockerfile.windows
+            tag: ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2019-amd64:${{ needs.read-version.outputs.VERSION }}
+          - os: windows-2022
+            base: ltsc2022
+            file: src/apm/dotnet_windows/Dockerfile.windows
+            tag: ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2022-amd64:${{ needs.read-version.outputs.VERSION }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login to GitHub Package Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.K8S_AGENTS_GHCR_TOKEN }}
+
+      - name: Build and Push Docker image
+        run: |
+          docker build -f ${{ matrix.file }} --build-arg BASE=${{ matrix.base }} --build-arg VERSION=${{ needs.read-version.outputs.VERSION }} -t ${{ matrix.tag }} .
+          docker push ${{ matrix.tag }}
+
+  publish-manifest:
+    name: Publish Manifest
+    runs-on: ubuntu-latest
+    needs: build-publish-containers
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+        # Redundant GITHUB_OUTPUT will not propigate to this job
+      - name: Read version
+        id: get_version
+        run: |
+          VERSION=$(cat src/apm/dotnet_windows/version.txt)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Login to GitHub Package Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.K8S_AGENTS_GHCR_TOKEN }}
+
+      - name: Docker Manifest
+        run: |          
+          docker manifest create ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows:${{ env.VERSION }} \
+            --amend ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2019-amd64:${{ env.VERSION }} \
+            --amend ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2022-amd64:${{ env.VERSION }}
+
+      - name: Docker Annotate
+        run: |
+          docker manifest annotate --os windows --arch amd64 \
+            --os-version "10.0.17763.6414" \
+            ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows:${{ env.VERSION }} ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2019-amd64:${{ env.VERSION }}
+
+          docker manifest annotate --os windows --arch amd64 \
+            --os-version "10.0.20348.2762" \
+            ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows:${{ env.VERSION }} ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows-ltsc2022-amd64:${{ env.VERSION }}
+
+      - name: Docker Push Manifest
+        run: |
+          docker manifest push ghcr.io/${{ github.repository_owner }}/k8s-agents-operator-windows/newrelic-dotnet-init-windows:${{ env.VERSION }}

charts/k8s-agents-operator/Chart.yaml

@@ -8,9 +8,9 @@ dependencies:
     version: 1.3.0
     repository: "https://helm-charts.newrelic.com"
 appVersion: '0.16.1'
-home: https://github.com/newrelic/k8s-agents-operator/blob/main/charts/k8s-agents-operator/README.md
+home: https://github.com/newrelic-experimental/k8s-agents-operator-windows/blob/main/charts/k8s-agents-operator/README.md
 sources:
-  - https://github.com/newrelic/k8s-agents-operator
+  - https://github.com/newrelic-experimental/k8s-agents-operator-windows
 maintainers:
   - name: csongnr
     url: https://github.com/csongnr

charts/k8s-agents-operator/README.md

@@ -4,7 +4,7 @@
 
 A Helm chart for the Kubernetes Agents Operator
 
-**Homepage:** <https://github.com/newrelic/k8s-agents-operator/blob/main/charts/k8s-agents-operator/README.md>
+**Homepage:** <https://github.com/newrelic-experimental/k8s-agents-operator-windows/blob/main/charts/k8s-agents-operator/README.md>
 
 ## Prerequisites
 
@@ -14,16 +14,16 @@ A Helm chart for the Kubernetes Agents Operator
 
 ### Requirements
 
-Add the `k8s-agents-operator` Helm chart repository:
+Add the `k8s-agents-operator-windows` Helm chart repository:
 ```shell
-helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator
+helm repo add k8s-agents-operator-windows https://newrelic-experimental.github.io/k8s-agents-operator-windows/
 ```
 
 ### Instrumentation
 
-Install the [`k8s-agents-operator`](https://github.com/newrelic/k8s-agents-operator) Helm chart:
+Install the [`k8s-agents-operator`](https://github.com/newrelic-experimental/k8s-agents-operator-windows) Helm chart:
 ```shell
-helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \
+helm upgrade --install k8s-agents-operator-windows k8s-agents-operator-windows/k8s-agents-operator \
   --namespace newrelic \
   --create-namespace \
   --values your-custom-values.yaml
@@ -55,6 +55,19 @@ spec:
     image: newrelic/newrelic-dotnet-init:latest
     # env: ...
 ```
+For .NET on Windows
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-dotnet-windows
+spec:
+  agent:
+    language: dotnet-windows
+    image: ghrc.io/andrew-lozoya/newrelic-dotnet-windows-init:10.32.0
+    # env: ...
+```
 
 For Java
 
@@ -215,11 +228,11 @@ To see the available charts:
 helm search repo k8s-agents-operator
 ```
 
-If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic.github.io/k8s-agents-operator/index.yaml).
+If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic-experimental.github.io/k8s-agents-operator-windows/index.yaml).
 
 ## Source Code
 
-* <https://github.com/newrelic/k8s-agents-operator>
+* <https://github.com/newrelic-experimental/k8s-agents-operator-windows>
 
 ## Requirements
 

charts/k8s-agents-operator/README.md.gotmpl

@@ -16,16 +16,16 @@
 
 ### Requirements
 
-Add the `k8s-agents-operator` Helm chart repository:
+Add the `k8s-agents-operator-windows` Helm chart repository:
 ```shell
-helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator
+helm repo add k8s-agents-operator-windows https://newrelic-experimental.github.io/k8s-agents-operator-windows/
 ```
 
 ### Instrumentation
 
-Install the [`k8s-agents-operator`](https://github.com/newrelic/k8s-agents-operator) Helm chart:
+Install the [`k8s-agents-operator`](https://github.com/newrelic-experimental/k8s-agents-operator-windows) Helm chart:
 ```shell
-helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \
+helm upgrade --install k8s-agents-operator-windows k8s-agents-operator-windows/k8s-agents-operator \
   --namespace newrelic \
   --create-namespace \
   --values your-custom-values.yaml
@@ -58,6 +58,20 @@ spec:
     # env: ...
 ```
 
+For .NET on Windows
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-dotnet-windows
+spec:
+  agent:
+    language: dotnet-windows
+    image: ghrc.io/andrew-lozoya/newrelic-dotnet-windows-init:10.32.0
+    # env: ...
+```
+
 For Java
 
 ```yaml
@@ -217,7 +231,7 @@ To see the available charts:
 helm search repo k8s-agents-operator
 ```
 
-If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic.github.io/k8s-agents-operator/index.yaml).
+If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic-experimental.github.io/k8s-agents-operator-windows/index.yaml).
 
 {{ template "chart.sourcesSection" . }}
 

charts/k8s-agents-operator/templates/NOTES.txt

@@ -24,7 +24,7 @@ kubectl get deployments -o wide -w --namespace {{ .Release.Namespace }} {{ inclu
 WARNING: This deployment will be incomplete until you configure your Instrumentation custom resource definition.
 =====================================
 
-Please visit https://github.com/newrelic/k8s-agents-operator for instructions on how to create & configure the
+Please visit https://github.com/newrelic-experimental/k8s-agents-operator-windows for instructions on how to create & configure the
 Instrumentation custom resource definition required by the Operator.
 {{- else }}
 

charts/k8s-agents-operator/templates/_helpers.tpl

@@ -5,3 +5,10 @@ Returns if the template should render, it checks if the required values are set.
 {{- $licenseKey := include "newrelic.common.license._licenseKey" . -}}
 {{- and (or $licenseKey)}}
 {{- end -}}
+{{/*
+Create a node selector for Linux nodes
+*/}}
+{{- define "linux.nodeSelector" -}}
+nodeSelector:
+  kubernetes.io/os: linux
+{{- end -}}

charts/k8s-agents-operator/templates/deployment.yaml

@@ -26,6 +26,7 @@ spec:
         control-plane: controller-manager
         {{- include "newrelic.common.labels" . | nindent 8 }}
     spec:
+      {{ include "linux.nodeSelector" . | nindent 6 }}
       containers:
       - args:
         - --metrics-addr=127.0.0.1:8080

charts/k8s-agents-operator/values.yaml

@@ -22,8 +22,8 @@ controllerManager:
 
   manager:
     image:
-      repository: newrelic/k8s-agents-operator
-      tag:
+      repository: ghcr.io/newrelic-experimental/k8s-agents-operator-windows
+      tag: edge
       pullPolicy:
     resources:
       requests:

go.mod

@@ -1,4 +1,4 @@
-module github.com/newrelic/k8s-agents-operator
+module github.com/newrelic-experimental/k8s-agents-operator-windows
 
 go 1.23.2
 

src/apm/dotnet.go

@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha2"
+	"github.com/newrelic-experimental/k8s-agents-operator-windows/src/api/v1alpha2"
 )
 
 const (

src/apm/dotnet_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha2"
+	"github.com/newrelic-experimental/k8s-agents-operator-windows/src/api/v1alpha2"
 )
 
 func TestDotnetInjector_Language(t *testing.T) {

src/apm/dotnet_windows/Dockerfile.windows

@@ -0,0 +1,14 @@
+# Use the Windows Nano Server as the base image
+ARG BASE
+FROM mcr.microsoft.com/windows/nanoserver:${BASE}
+
+# Argument to specify the version of the New Relic agent
+ARG VERSION
+
+# Set the working directory
+WORKDIR C:\\instrumentation
+
+# Download and extract the New Relic .NET agent
+RUN curl.exe -L -o newrelic-agent.zip https://download.newrelic.com/dot_net_agent/latest_release/NewRelicDotNetAgent_%VERSION%_x64.zip\
+    && tar.exe -xzf newrelic-agent.zip\
+    && del newrelic-agent.zip

src/apm/dotnet_windows/version.txt

@@ -0,0 +1 @@
+10.32.0