Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6,579 changes: 6,579 additions & 0 deletions THIRD_PARTY_LICENSES.txt

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions buildrpm/Makefile.core.mk.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git Makefile.core.mk Makefile.core.mk
index e406260b5b..1bdd9912d9 100644
--- Makefile.core.mk
+++ Makefile.core.mk
@@ -152,7 +152,7 @@ default: init build test

.PHONY: init
# Downloads envoy, based on the SHA defined in the base pilot Dockerfile
-init: $(TARGET_OUT)/istio_is_init init-ztunnel-rs
+init: $(TARGET_OUT)/istio_is_init
@mkdir -p ${TARGET_OUT}/logs
@mkdir -p ${TARGET_OUT}/release

6 changes: 6 additions & 0 deletions buildrpm/buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
istio.io/istio/pkg/version.buildVersion=1.26.0
istio.io/istio/pkg/version.buildGitRevision=1.26.0
istio.io/istio/pkg/version.buildUser=oracle
istio.io/istio/pkg/version.buildHost=oracle
istio.io/istio/pkg/version.buildDockerHub=container-registry.oracle.com/olcne
istio.io/istio/pkg/version.buildStatus=Clean
13 changes: 13 additions & 0 deletions buildrpm/egress-values.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git manifests/charts/gateways/istio-egress/values.yaml manifests/charts/gateways/istio-egress/values.yaml
index 9428b4e..de4dc39 100644
--- manifests/charts/gateways/istio-egress/values.yaml
+++ manifests/charts/gateways/istio-egress/values.yaml
@@ -109,7 +109,7 @@ gateways:
podAntiAffinityTermLabelSelector: []

# whether to run the gateway in a privileged container
- runAsRoot: false
+ runAsRoot: true

# The injection template to use for the gateway. If not set, no injection will be performed.
injectionTemplate: ""
15 changes: 15 additions & 0 deletions buildrpm/egress-values_1.22.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:100644 100644 eb0d20f5fa 0000000000 M manifests/charts/gateways/istio-egress/values.yaml

diff --git manifests/charts/gateways/istio-egress/values.yaml manifests/charts/gateways/istio-egress/values.yaml
index eb0d20f5fa..f18f64066b 100644
--- manifests/charts/gateways/istio-egress/values.yaml
+++ manifests/charts/gateways/istio-egress/values.yaml
@@ -97,7 +97,7 @@ defaults:
podAntiAffinityTermLabelSelector: []

# whether to run the gateway in a privileged container
- runAsRoot: false
+ runAsRoot: true

# The injection template to use for the gateway. If not set, no injection will be performed.
injectionTemplate: ""
13 changes: 13 additions & 0 deletions buildrpm/gobuild.sh.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git common/scripts/gobuild.sh common/scripts/gobuild.sh
index 25f2c8120d..9b1f89eeb1 100755
--- common/scripts/gobuild.sh
+++ common/scripts/gobuild.sh
@@ -70,7 +70,7 @@ while read -r line; do
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X ${line}"
done < "${BUILDINFO}"

-OPTIMIZATION_FLAGS=(-trimpath)
+OPTIMIZATION_FLAGS=(-trimpath=false)
if [ "${DEBUG}" == "1" ]; then
OPTIMIZATION_FLAGS=()
fi
13 changes: 13 additions & 0 deletions buildrpm/ingress-values.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git manifests/charts/gateways/istio-ingress/values.yaml manifests/charts/gateways/istio-ingress/values.yaml
index cd595c7..78dd2fa 100644
--- manifests/charts/gateways/istio-ingress/values.yaml
+++ manifests/charts/gateways/istio-ingress/values.yaml
@@ -118,7 +118,7 @@ gateways:
podAntiAffinityTermLabelSelector: []

# whether to run the gateway in a privileged container
- runAsRoot: false
+ runAsRoot: true

# The injection template to use for the gateway. If not set, no injection will be performed.
injectionTemplate: ""
15 changes: 15 additions & 0 deletions buildrpm/ingress-values_1.22.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:100644 100644 2f7145a702 0000000000 M manifests/charts/gateways/istio-ingress/values.yaml

diff --git manifests/charts/gateways/istio-ingress/values.yaml manifests/charts/gateways/istio-ingress/values.yaml
index 2f7145a702..5ce6c6d532 100644
--- manifests/charts/gateways/istio-ingress/values.yaml
+++ manifests/charts/gateways/istio-ingress/values.yaml
@@ -109,7 +109,7 @@ defaults:
podAntiAffinityTermLabelSelector: []

# whether to run the gateway in a privileged container
- runAsRoot: false
+ runAsRoot: true

# The injection template to use for the gateway. If not set, no injection will be performed.
injectionTemplate: ""
13 changes: 13 additions & 0 deletions buildrpm/init.sh.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git bin/init.sh bin/init.sh
index 8849076905..a2c3122389 100755
--- bin/init.sh
+++ bin/init.sh
@@ -134,7 +134,7 @@ else
fi

# Download and extract the Envoy linux release binary.
-download_envoy_if_necessary "${ISTIO_ENVOY_LINUX_RELEASE_URL}" "$ISTIO_ENVOY_LINUX_RELEASE_PATH" "${SIDECAR}"
+#download_envoy_if_necessary "${ISTIO_ENVOY_LINUX_RELEASE_URL}" "$ISTIO_ENVOY_LINUX_RELEASE_PATH" "${SIDECAR}"
ISTIO_ENVOY_NATIVE_PATH=${ISTIO_ENVOY_LINUX_RELEASE_PATH}

# Copy native envoy binary to TARGET_OUT
59 changes: 59 additions & 0 deletions buildrpm/istio-container-images.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@

%global kubectl $(dnf list kubectl --showduplicates | grep kubectl | tail -1 | awk '{print substr($2, 1, length($2)-6)}')
%global debug_package %{nil}
%global image_dir bin/istio_images
%global istio_version 1.26.0
%global istio_release 1%{?dist}
%global kubectl_version %{kubectl}
%global image_tag %{istio_version}
%global _buildhost build-ol%{?oraclelinux}-%{?_arch}.oracle.com

Name: istio-container-images
Version: %{istio_version}
Release: %{istio_release}
Summary: Istio(Connect, secure, control, and observe services) docker images
License: UPL
Source: %{name}-%{version}.tar.bz2
Vendor: Oracle America
BuildRequires: rpm >= 4.11.3
BuildRequires: ca-certificates

%prep
%setup -n %{name}-%{version}

%description
Istio is an open platform for providing a uniform way to integrate microservices,
manage traffic flow across microservices, enforce policies and aggregate telemetry data.
Istio's control plane provides an abstraction layer over the underlying cluster management platform,
such as Kubernetes, Mesos, etc.

%build
chmod +x ./oracle/build-istio-container-images.sh
YUM_REPO=%{yum_repo} ./oracle/build-istio-container-images.sh \
--image-dir %{image_dir} \
--image-tag %{image_tag} \
--rpm-release %{istio_release} \
--rpm-version %{istio_version} \
--kubectl-version %{kubectl_version}

%install
install -m 755 -d %{buildroot}/usr/local/share/istio
install -p -m 755 -t %{buildroot}/usr/local/share/istio %{image_dir}/pilot.tar
install -p -m 755 -t %{buildroot}/usr/local/share/istio %{image_dir}/proxyv2.tar
install -p -m 755 -t %{buildroot}/usr/local/share/istio %{image_dir}/istio_kubectl.tar
install -p -m 755 -t %{buildroot}/usr/local/share/istio %{image_dir}/install-cni.tar
install -p -m 755 -t %{buildroot}/usr/local/share/istio %{image_dir}/istio-istioctl.tar

%files
%license ./LICENSE ./THIRD_PARTY_LICENSES.txt olm/SECURITY.md
/usr/local/share/istio/pilot.tar
/usr/local/share/istio/proxyv2.tar
/usr/local/share/istio/istio_kubectl.tar
/usr/local/share/istio/install-cni.tar
/usr/local/share/istio/istio-istioctl.tar

%clean

%changelog
* Thu Oct 16 2025 Oracle Cloud Native Environment Authors <noreply@oracle.com> - 1.26.0-1
- Added Oracle specific files for 1.26.0
Loading
Loading