Skip to content

Commit f944548

Browse files
authored
Release/4.0 Modify install-istio.sh to remove docker.io dependency (#3954)
* Modify install-istio.sh to remove docker.io dependency
1 parent c212d54 commit f944548

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022,2023 Oracle and/or its affiliates.
1+
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
# Format: Relative Source Image Location;Relative Target Image Location
@@ -61,14 +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 Repository for the following image(s)
65-
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
66-
#docker.elastic.co/elasticsearch/elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
67-
#docker.elastic.co/elasticsearch/kibana:7.8.1;weblogick8s/test-images/docker/kibana:7.8.1
68-
#docker.elastic.co/elasticsearch/logstach:7.8.1;weblogick8s/test-images/docker/logstach:7.8.1
69-
#ghcr.io/verrazzano/fluentd-kubernetes-daemonset:v1.14.5-20230131231729-f85741b;weblogick8s/test-images/fluentd-kubernetes-daemonset:v1.14.5
70-
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
71-
7264

7365
# WebLogic CPU Release 14.1.1.0
7466
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
@@ -101,3 +93,11 @@ middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-
10193
# FMW CPU Release 12.2.1.3
10294
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
10395
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu
96+
97+
# Manually Update the Target Repository for the following image(s)
98+
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
99+
#docker.elastic.co/elasticsearch/elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
100+
#docker.elastic.co/elasticsearch/kibana:7.8.1;weblogick8s/test-images/docker/kibana:7.8.1
101+
#docker.elastic.co/elasticsearch/logstach:7.8.1;weblogick8s/test-images/docker/logstach:7.8.1
102+
#ghcr.io/verrazzano/fluentd-kubernetes-daemonset:v1.14.5-20230131231729-f85741b;weblogick8s/test-images/fluentd-kubernetes-daemonset:v1.14.5
103+
#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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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:
@@ -39,9 +39,12 @@ ${KUBERNETES_CLI} create namespace istio-system
3939

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

42+
# set custom docker registry to gcr.io/istio-release to avoid
43+
# docker.io/istio dependency.
44+
echo "Set the image registry to gcr.io/istio-release during istio installation"
4245
( cd ${istiodir}
4346
bin/istioctl x precheck
44-
bin/istioctl install --set profile=demo --set values.global.imagePullSecrets[0]=docker-istio-secret --set meshConfig.enablePrometheusMerge=false -y
47+
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
4548
bin/istioctl verify-install
4649
bin/istioctl version
4750
)

0 commit comments

Comments
 (0)