general fixes and upgrades (#469)

PlayFab · Nov 23, 2024 · 6453367 · 6453367
1 parent f65926e
commit 6453367
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Install .NET 6
       uses: actions/setup-dotnet@v1 
       with:
-        dotnet-version: '6.0.x' # SDK Version to use; x will use the latest version
+        dotnet-version: '8.0.x' # SDK Version to use; x will use the latest version
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

diff --git a/Makefile b/Makefile
@@ -65,13 +65,13 @@ builddockerlocal: build
 	done
 
 installkind:
-	curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.18.0/kind-linux-amd64
+	curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.25.0/kind-linux-amd64
 	chmod +x ./kind
 	mkdir -p ./pkg/operator/testbin/bin
 	mv ./kind ./pkg/operator/testbin/bin/kind
 
 createkindcluster: 
-	./pkg/operator/testbin/bin/kind create cluster --config ./e2e/kind-config.yaml --image kindest/node:v1.27.0
+	./pkg/operator/testbin/bin/kind create cluster --config ./e2e/kind-config.yaml --image kindest/node:v1.31.2
 
 deletekindcluster:
 	./pkg/operator/testbin/bin/kind delete cluster 

diff --git a/pkg/operator/Makefile b/pkg/operator/Makefile
@@ -1,7 +1,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.26.1
+ENVTEST_K8S_VERSION = 1.31.0
 
 CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
 

diff --git a/samples/netcore/Dockerfile b/samples/netcore/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
 WORKDIR /app
 EXPOSE 56001
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 WORKDIR /src
 COPY samples/netcore/netcore.csproj .
 RUN dotnet restore "./netcore.csproj"

diff --git a/samples/netcore/Dockerfile.win b/samples/netcore/Dockerfile.win
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-nanoserver-1809 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS base
 WORKDIR /app
 EXPOSE 56001
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0-nanoserver-1809 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-1809 AS build
 WORKDIR /src
 COPY samples/netcore/netcore.csproj .
 RUN dotnet restore "./netcore.csproj"

diff --git a/samples/netcore/netcore.csproj b/samples/netcore/netcore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/openarena/Dockerfile b/samples/openarena/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /source
 
 # copy csproj and restore as distinct layers

diff --git a/samples/openarena/openarena.csproj b/samples/openarena/openarena.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>