Skip to content

Commit 356fb4d

Browse files
authored
Fix authorino reference (Kuadrant#77)
* upgrade istio 1.12.1 * upgrade authorino v0.7.0 using the operator v0.1.0 * testing env cluster upgrade to k8s 1.23.1 * fix ci kind setup tests
1 parent 3bae496 commit 356fb4d

File tree

15 files changed

+8621
-4430
lines changed

15 files changed

+8621
-4430
lines changed

.github/workflows/testing.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ jobs:
3939
name: Run integration tests
4040
runs-on: ubuntu-latest
4141
steps:
42-
# https://github.com/kubernetes-sigs/kind/issues/2240
43-
- name: Patch host to enable kind nodes ready
44-
run: |
45-
sudo sysctl net/netfilter/nf_conntrack_max=131072
4642
- name: Set up Go 1.16.x
4743
uses: actions/setup-go@v2
4844
with:
@@ -53,7 +49,7 @@ jobs:
5349
- name: Create k8s Kind Cluster
5450
uses: helm/[email protected]
5551
with:
56-
version: v0.10.0
52+
version: v0.11.1
5753
config: utils/local-deployment/kind-cluster.yaml
5854
cluster_name: kuadrant-local
5955
wait: 120s

Makefile

+12-14
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,18 @@ KIND = $(shell pwd)/bin/kind
236236
kind: ## Download kind locally if necessary.
237237
$(call go-get-tool,$(KIND),sigs.k8s.io/[email protected])
238238

239-
# Download istioctl.
240-
ISTIOCTL = $(shell pwd)/bin/istioctl
241-
ISTIOCTLVERSION = 1.9.4
242-
istioctl:
243-
ifeq (,$(wildcard $(ISTIOCTL)))
244-
@{ \
245-
set -e ;\
246-
mkdir -p $(dir $(ISTIOCTL)) ;\
247-
curl -sSL https://raw.githubusercontent.com/istio/istio/master/release/downloadIstioCtl.sh | ISTIO_VERSION=$(ISTIOCTLVERSION) HOME=$(shell pwd)/bin/ sh - > /dev/null 2>&1;\
248-
mv $(shell pwd)/bin/.istioctl/bin/istioctl $(ISTIOCTL) ;\
249-
rm -r $(shell pwd)/bin/.istioctl ;\
250-
chmod +x $(ISTIOCTL) ;\
251-
}
252-
endif
239+
# istioctl tool
240+
ISTIOCTL=$(PROJECT_PATH)/bin/istioctl
241+
ISTIOVERSION = 1.12.1
242+
$(ISTIOCTL):
243+
mkdir -p $(PROJECT_PATH)/bin
244+
$(eval TMP := $(shell mktemp -d))
245+
cd $(TMP); curl -sSL https://istio.io/downloadIstio | ISTIO_VERSION=$(ISTIOVERSION) sh -
246+
cp $(TMP)/istio-$(ISTIOVERSION)/bin/istioctl ${ISTIOCTL}
247+
-rm -rf $(TMP)
248+
249+
.PHONY: istioctl
250+
istioctl: $(ISTIOCTL)
253251

254252
.PHONY: generate-istio-manifests
255253
generate-istio-manifests: istioctl ## Generates istio manifests with patches.

config/deploy/manifests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ metadata:
388388
name: kuadrant-manager-role
389389
rules:
390390
- apiGroups:
391-
- authorino.3scale.net
391+
- authorino.kuadrant.io
392392
resources:
393393
- authconfigs
394394
verbs:

config/rbac/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: manager-role
88
rules:
99
- apiGroups:
10-
- authorino.3scale.net
10+
- authorino.kuadrant.io
1111
resources:
1212
- authconfigs
1313
verbs:

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/google/go-cmp v0.5.5
1010
github.com/google/uuid v1.1.2
1111
github.com/jarcoal/httpmock v1.0.8
12-
github.com/kuadrant/authorino v0.4.0
12+
github.com/kuadrant/authorino v0.7.0
1313
github.com/kuadrant/limitador-operator v0.2.0
1414
github.com/onsi/ginkgo v1.16.4
1515
github.com/onsi/gomega v1.15.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
431431
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
432432
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
433433
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
434-
github.com/kuadrant/authorino v0.4.0 h1:RPdV/L8bJv1IM/eDD1SPSCeT676BSPXAMYAnXSfWBIQ=
435-
github.com/kuadrant/authorino v0.4.0/go.mod h1:2BBSZlKAfq+i2+5vtvePanRDqJkiNypKqraS4Mh/BnA=
434+
github.com/kuadrant/authorino v0.7.0 h1:YgeFzteyzlfFZqWZN3b7cXbyOZZ2vgHP2UHp7yktrvg=
435+
github.com/kuadrant/authorino v0.7.0/go.mod h1:+ddl2McmSC8vKufmR/iA4ILOwkTCe5dbX+uzWSZ4w1Q=
436436
github.com/kuadrant/limitador-operator v0.2.0 h1:9hQ5Hmfrx2SG0+RXvwTuHIq8Mqp9L+7J1E3T7X2upgs=
437437
github.com/kuadrant/limitador-operator v0.2.0/go.mod h1:lMtN0/84z3kHZheljpbQN9vrgfPab+Zvv/7CTU3dS+k=
438438
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=

pkg/authproviders/authorino/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Provider struct {
2222
*reconcilers.BaseReconciler
2323
}
2424

25-
// +kubebuilder:rbac:groups=authorino.3scale.net,resources=authconfigs,verbs=get;list;watch;create;update;patch;delete
25+
// +kubebuilder:rbac:groups=authorino.kuadrant.io,resources=authconfigs,verbs=get;list;watch;create;update;patch;delete
2626

2727
func New(baseReconciler *reconcilers.BaseReconciler) *Provider {
2828
utilruntime.Must(authorino.AddToScheme(baseReconciler.Scheme()))

utils/local-deployment/authorino-operator.yaml

+2,093
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)