Skip to content

Commit a8df9e5

Browse files
authored
Main: Modify install-istio.sh to remove docker.io dependency (#3953)
* Modify install-istio.sh to remove docker.io dependency
1 parent b299a4e commit a8df9e5

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

integration-tests/src/test/resources/bash-scripts/images.properties

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12
6161
# Oracle DB Operator Image
6262
database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
6363

64-
# Manually Update the Target Reposiotory for the following image(s)
65-
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
66-
#elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
67-
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
68-
69-
7064
# WebLogic CPU Release 14.1.1.0
7165
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
7266
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu
@@ -98,3 +92,11 @@ middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-
9892
# FMW CPU Release 12.2.1.3
9993
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
10094
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu
95+
96+
# Manually Update the Target Repository for the following image(s)
97+
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
98+
#docker.elastic.co/elasticsearch/elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
99+
#docker.elastic.co/elasticsearch/kibana:7.8.1;weblogick8s/test-images/docker/kibana:7.8.1
100+
#docker.elastic.co/elasticsearch/logstach:7.8.1;weblogick8s/test-images/docker/logstach:7.8.1
101+
#ghcr.io/verrazzano/fluentd-kubernetes-daemonset:v1.14.5-20230131231729-f85741b;weblogick8s/test-images/fluentd-kubernetes-daemonset:v1.14.5
102+
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0

integration-tests/src/test/resources/bash-scripts/install-istio.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#!/bin/bash -x
2-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Description:
66
#
77
# This script install a given version of istio using Helm v3.x
8-
# Default istio version is 1.11.1
8+
# Default istio version is 1.13.2
99
# https://istio.io/docs/setup/install/istioctl/
1010
# https://istio.io/latest/docs/setup/install/standalone-operator/
1111
# https://github.com/istio/istio/releases
1212
# https://github.com/istio/istio/tags
1313

14-
1514
# Usage:
1615
#
1716
# $0 [istio-version] [install-dir]
@@ -39,9 +38,12 @@ ${KUBERNETES_CLI} create namespace istio-system
3938

4039
( ${KUBERNETES_CLI} create secret generic docker-istio-secret --type=kubernetes.io/dockerconfigjson --from-file=.dockerconfigjson=$HOME/.docker/config.json -n istio-system )
4140

41+
# set custom docker registry to gcr.io/istio-release to avoid
42+
# docker.io/istio dependency.
43+
echo "Set the image registry to gcr.io/istio-release during istio installation"
4244
( cd ${istiodir}
4345
bin/istioctl x precheck
44-
bin/istioctl install --set profile=demo --set values.global.imagePullSecrets[0]=docker-istio-secret --set meshConfig.enablePrometheusMerge=false -y
46+
bin/istioctl install --set meshConfig.enablePrometheusMerge=false --set values.global.imagePullSecrets[0]=docker-istio-secret --set hub=gcr.io/istio-release --set profile=demo -y
4547
bin/istioctl verify-install
4648
bin/istioctl version
4749
)

0 commit comments

Comments
 (0)