Skip to content

Commit 8c96567

Browse files
authored
Merge branch 'main' into dependabot/github_actions/sigstore/cosign-installer-3.10.0
2 parents 386df3e + 47c0889 commit 8c96567

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONTAINER_TOOL ?= docker
3333
SHELL = /usr/bin/env bash -o pipefail
3434
.SHELLFLAGS = -ec
3535

36-
K8S_VERSION ?= 1.34.1
36+
K8S_VERSION ?= 1.33.4
3737
ENVTEST_K8S_VERSION = $(K8S_VERSION)
3838
CILIUM_VERSION ?= 1.18.1
3939
VALKEY_VERSION ?= 8.1.3

config/rbac/role.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ rules:
4747
- patch
4848
- update
4949
- watch
50-
- apiGroups:
51-
- storage.k8s.io
52-
resources:
53-
- storageclasses
54-
verbs:
55-
- get
56-
- list
57-
- watch
5850
- apiGroups:
5951
- cert-manager.io
6052
resources:
@@ -126,3 +118,11 @@ rules:
126118
- patch
127119
- update
128120
- watch
121+
- apiGroups:
122+
- storage.k8s.io
123+
resources:
124+
- storageclasses
125+
verbs:
126+
- get
127+
- list
128+
- watch

hack/minikube.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ data:
5757
--set cluster.name=$name \
5858
--set cluster.id=$clusterid \
5959
--set externalIPs.enabled=true \
60-
--set enableCiliumEndpointSlice=true \
6160
--set ipam.operator.clusterPoolIPv4PodCIDRList=$podcidr \
6261
--set ipv4NativeRoutingCIDR=10.0.0.0/8 \
6362
--set routingMode="native" \
@@ -86,11 +85,11 @@ data:
8685
--set bgpControlPlane.enabled=true \
8786
--set endpointRoutes.enabled=true \
8887
--set nodePort.enabled=true \
89-
--set authentication.enabled=true \
90-
--set authentication.mutual.spire.enabled=true \
91-
--set authentication.mutual.spire.install.enabled=true \
92-
--set authentication.mutual.spire.serverAddress=spire-server.cilium-spire.svc.cluster.$name:8081 \
9388
--set k8sServicePort=8443 >> .cni-$name.yaml
89+
#--set authentication.enabled=true \
90+
#--set authentication.mutual.spire.enabled=true \
91+
#--set authentication.mutual.spire.install.enabled=true \
92+
#--set authentication.mutual.spire.serverAddress=spire-server.cilium-spire.svc.cluster.$name:8081 \
9493
#--set tunnel=disabled \
9594
#--set tunnelProtocol="" \
9695
#--set endpointStatus.enabled=true \
@@ -128,7 +127,7 @@ bootcluster_macos() {
128127

129128
addons() {
130129
kubectl delete pod -l k8s-app=kube-dns -n kube-system
131-
minikube addons enable registry -p north
130+
minikube addons enable registry -p north --images='Registry=docker.io/registry:2.8.3,KubeRegistryProxy=gcr.io/k8s-minikube/kube-registry-proxy:0.0.9'
132131
# use the addon, but through a tunnel
133132
#minikube addons enable ingress -p north
134133
#kubectl get svc -n ingress-nginx ingress-nginx-controller -o yaml > .ingress.yaml

0 commit comments

Comments
 (0)