Merge branch 'master' into encodedpath

stakater · Dec 16, 2024 · 5a26105 · 5a26105
2 parents 2484918 + 94c1bbb
commit 5a26105
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 55 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -71,7 +71,7 @@ jobs:
     # To identify any broken changes in dockerfiles or dependencies
 
     - name: Build image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -108,7 +108,7 @@ jobs:
         echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and Push image to ghcr registry
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}
@@ -136,7 +136,7 @@ jobs:
         echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and push image to DockerHub registry
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}
@@ -190,7 +190,7 @@ jobs:
       run: operator-sdk bundle validate ./bundle --select-optional name=operatorhub
 
     - name: Build and push Bundle Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.BUNDLE_DOCKER_FILE_PATH  }}

diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml
@@ -18,7 +18,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: ingressmonitorcontroller.v2.1.68
+  name: ingressmonitorcontroller.v2.1.69
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -151,7 +151,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: stakater/ingressmonitorcontroller:v2.1.68
+                image: stakater/ingressmonitorcontroller:v2.1.69
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -251,4 +251,4 @@ spec:
   provider:
     name: stakater
     url: https://stakater.com
-  version: 2.1.68
+  version: 2.1.69
diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml
@@ -3,10 +3,10 @@ name: ingressmonitorcontroller
 description: IngressMonitorController Operator chart that runs on kubernetes
 
 # Helm chart Version
-version: 2.1.68
+version: 2.1.69
 
 # Application version to be deployed
-appVersion: 2.1.68
+appVersion: 2.1.69
 
 keywords:
   - IngressMonitorController

diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml
@@ -8,7 +8,7 @@ replicaCount: 1
 
 image:
   repository: stakater/ingressmonitorcontroller
-  tag: v2.1.68
+  tag: v2.1.69
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: stakater/ingressmonitorcontroller
-  newTag: v2.1.68
+  newTag: v2.1.69
diff --git a/go.mod b/go.mod
@@ -20,6 +20,7 @@ require (
 	github.com/russellcardullo/go-pingdom v1.3.0
 	github.com/stakater/operator-utils v0.1.13
 	github.com/stretchr/testify v1.9.0
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/api v0.149.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697
 	gopkg.in/yaml.v2 v2.4.0
@@ -31,11 +32,10 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
 	github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
@@ -50,13 +50,13 @@ require (
 	github.com/dimchansky/utfbom v1.1.0 // indirect
 	github.com/emicklei/go-restful v2.16.0+incompatible // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/go-logr/zapr v1.2.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
@@ -92,9 +92,7 @@ require (
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
 	google.golang.org/grpc v1.67.1 // indirect