Merge pull request #430 from fidelity/dependabot/go_modules/github.co…

…m/prometheus/client_golang-1.20.4 Oct Release
fidelity · Oct 17, 2024 · c20c696 · c20c696
2 parents e6bd542 + 3027055
commit c20c696
Show file tree

Hide file tree

Showing 13 changed files with 657 additions and 505 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -103,7 +103,7 @@ jobs:
         run: |
           [ -z "${GOPATH}" ] && export GOPATH=$HOME/go
           PATH="${GOPATH}/bin:${PATH}"
-          kind create cluster --image kindest/node:v1.29.4
+          kind create cluster --image kindest/node:v1.31.0
           echo "sleep 60s to wait node ready"
           sleep 60s
           kubectl get node

diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ ARG TARGETOS
 # Build
 RUN mkdir bin
 RUN apt install -y curl tar
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/${TARGETOS}/${TARGETARCH}/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/${TARGETOS}/${TARGETARCH}/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_${TARGETOS}_${TARGETARCH}.tar.gz

diff --git a/Dockerfile-check b/Dockerfile-check
@@ -20,7 +20,7 @@ COPY bin/ bin/
 RUN apt install -y curl
 RUN bin/setup.sh
 # Temporary fix see https://github.com/fidelity/kraan/issues/114
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN cp bin/* /usr/local/bin

diff --git a/Dockerfile-dev b/Dockerfile-dev
@@ -18,7 +18,7 @@ RUN go mod download
 RUN mkdir bin
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go
 RUN apt install -y curl
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_linux_amd64.tar.gz

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.3.43
+v0.3.44
diff --git a/bin/setup.sh b/bin/setup.sh
@@ -4,7 +4,7 @@ linter_version=1.55.2
 mockgen_version=v1.6.0
 helm_version=v3.6.1
 kind_version=v0.11.1
-kubectl_version=v1.29.7
+kubectl_version=v1.31.0
 kustomize_version=v3.8.7
 
 function usage()

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 description: A Helm chart for kraan controller
 name: kraan-controller
 type: application
-appVersion: v0.3.43
-version: v0.3.43
+appVersion: v0.3.44
+version: v0.3.44
diff --git a/chart/templates/gotk/helm-controller/crd.yaml b/chart/templates/gotk/helm-controller/crd.yaml
diff --git a/chart/templates/gotk/rbac.yaml b/chart/templates/gotk/rbac.yaml
@@ -17,125 +17,9 @@ rules:
       - source.toolkit.fluxcd.io
     resources:
       - buckets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - buckets/finalizers
-    verbs:
-      - create
-      - delete
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - buckets/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
       - gitrepositories
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - gitrepositories/finalizers
-    verbs:
-      - create
-      - delete
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - gitrepositories/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
       - helmcharts
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - helmcharts/finalizers
-    verbs:
-      - create
-      - delete
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - helmcharts/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
       - helmrepositories
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - helmrepositories/finalizers
-    verbs:
-      - create
-      - delete
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
-      - helmrepositories/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - source.toolkit.fluxcd.io
-    resources:
       - ocirepositories
     verbs:
       - create
@@ -148,6 +32,10 @@ rules:
   - apiGroups:
       - source.toolkit.fluxcd.io
     resources:
+      - buckets/finalizers
+      - gitrepositories/finalizers
+      - helmcharts/finalizers
+      - helmrepositories/finalizers
       - ocirepositories/finalizers
     verbs:
       - create
@@ -158,6 +46,10 @@ rules:
   - apiGroups:
       - source.toolkit.fluxcd.io
     resources:
+      - buckets/status
+      - gitrepositories/status
+      - helmcharts/status
+      - helmrepositories/status
       - ocirepositories/status
     verbs:
       - get