NO-ISSUE: Stop using custom Authorino operator image

charts/README.md

@@ -218,14 +218,10 @@ spec:
 .
 ```
 
-Install the _Authorino_ operator. Due to an issue with the configuration of custom CA certificates in the Authorino
-operator (see [here](https://github.com/Kuadrant/authorino-operator/pull/282)) it is necessary to replace the operator
-image. So you need to download the manifests, replace the image, and then apply the result:
+Install the _Authorino_ operator:
 
 ```shell
-$ curl -o authorino.yaml https://raw.githubusercontent.com/Kuadrant/authorino-operator/refs/heads/release-v0.22.0/config/deploy/manifests.yaml
-$ sed -i 's|quay.io/kuadrant/authorino-operator:v0.20.0|quay.io/osac/authorino-operator:latest|g' authorino.yaml
-$ kubectl apply -f authorino.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/Kuadrant/authorino-operator/refs/heads/release-v0.23.1/config/deploy/manifests.yaml
 ```
 
 Deploy the application:

charts/service/templates/authorino/authorino.yaml

@@ -34,4 +34,7 @@ spec:
     - name: ca-bundle
       configMaps:
       - {{ $caBundleConfigMap }}
-      mountPath: /etc/ssl/certs
+      items:
+      - key: bundle.pem
+        path: tls-ca-bundle.pem
+      mountPath: /etc/pki/ca-trust/extracted/pem

internal/testing/kind.go

@@ -23,10 +23,8 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"io"
 	"log/slog"
 	"math/big"
-	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -862,54 +860,7 @@ func (k *Kind) installCa(ctx context.Context) (err error) {
 }
 
 func (k *Kind) installAuthorino(ctx context.Context) (err error) {
-	// The authorino operator doesn't currently support adding trusted CA certificates, due to a conflicting use of
-	// the '/etc/ssl/certs' directory, see here for details:
-	//
-	// https://github.com/Kuadrant/authorino-operator/pull/282
-	//
-	// Till that is fixed we need to use an alternative container image that contains the fix. So we need to
-	// download the manifests and then replace the image.
-	response, err := http.Get(authorinoManifests)
-	if err != nil {
-		return
-	}
-	defer response.Body.Close()
-	manifestsBytes, err := io.ReadAll(response.Body)
-	if err != nil {
-		return
-	}
-	manfiestsTexts := string(manifestsBytes)
-	manfiestsTexts = strings.ReplaceAll(
-		manfiestsTexts,
-		"quay.io/kuadrant/authorino-operator:"+authorinoVersion,
-		"quay.io/innabox/authorino-operator:latest",
-	)
-	manifestsDir, err := os.MkdirTemp("", "*.authorino")
-	if err != nil {
-		return
-	}
-	defer func() {
-		err := os.RemoveAll(manifestsDir)
-		if err != nil {
-			k.logger.LogAttrs(
-				ctx,
-				slog.LevelError,
-				"Failed to remove temporary manifests directory",
-				slog.String("dir", manifestsDir),
-				slog.Any("error", err),
-			)
-		}
-	}()
-	manifestsFile := filepath.Join(manifestsDir, "manifests.yaml")
-	if err != nil {
-		return
-	}
-	os.WriteFile(manifestsFile, []byte(manfiestsTexts), 0600)
-	if err != nil {
-		return
-	}
-
-	// Apply the authorino manifest:
+	// Apply the authorino manifests:
 	k.logger.DebugContext(ctx, "Applying authorino manifests")
 	applyCmd, err := NewCommand().
 		SetLogger(k.logger).
@@ -919,7 +870,7 @@ func (k *Kind) installAuthorino(ctx context.Context) (err error) {
 		SetArgs(
 			"apply",
 			"--kubeconfig", k.kubeconfigFile,
-			"--filename", manifestsFile,
+			"--filename", authorinoManifests,
 		).
 		Build()
 	if err != nil {

manifests/README.md

@@ -212,14 +212,10 @@ spec:
 .
 ```
 
-Install the _Authorino_ operator. Due to an issue with the configuration of custom CA certificates in the Authorino
-operator (see [here](https://github.com/Kuadrant/authorino-operator/pull/282)) it is necessary to replace the operator
-image. So you need to download the manifests, replace the image, and then apply the result:
+Install the _Authorino_ operator:
 
 ```shell
-$ curl -o authorino.yaml https://raw.githubusercontent.com/Kuadrant/authorino-operator/refs/heads/release-v0.22.0/config/deploy/manifests.yaml
-$ sed -i 's|quay.io/kuadrant/authorino-operator:v0.20.0|quay.io/osac/authorino-operator:latest|g' authorino.yaml
-$ kubectl apply -f authorino.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/Kuadrant/authorino-operator/refs/heads/release-v0.23.1/config/deploy/manifests.yaml
 ```
 
 Deploy the application:

manifests/base/authorino/authorino.yaml

@@ -31,4 +31,7 @@ spec:
     - name: ca-bundle
       configMaps:
       - ca-bundle
-      mountPath: /etc/ssl/certs
+      items:
+      - key: bundle.pem
+        path: tls-ca-bundle.pem
+      mountPath: /etc/pki/ca-trust/extracted/pem