Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • eclipse-research-labs/nemo-project/nemo-infrastructure-management/federated-meta-network-cluster-controller/multi-domain-l2s-m
1 result
Show changes
Commits on Source (3)
...@@ -23,6 +23,11 @@ jobs: ...@@ -23,6 +23,11 @@ jobs:
run: | run: |
git remote add gitlab https://oauth2:${{ secrets.GITLAB_TOKEN }}@gitlab.eclipse.org/eclipse-research-labs/nemo-project/nemo-infrastructure-management/federated-meta-network-cluster-controller/multi-domain-l2s-m.git git remote add gitlab https://oauth2:${{ secrets.GITLAB_TOKEN }}@gitlab.eclipse.org/eclipse-research-labs/nemo-project/nemo-infrastructure-management/federated-meta-network-cluster-controller/multi-domain-l2s-m.git
- name: Fetch and merge changes from GitLab
run: |
git fetch gitlab nemo:development
git merge gitlab/nemo:development
- name: Push to GitLab - name: Push to GitLab
run: | run: |
git push gitlab nemo:development git push gitlab nemo:development
...@@ -125,6 +125,7 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi ...@@ -125,6 +125,7 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi
echo "---" >> deployments/l2sm-deployment.yaml # Add a document separator before appending echo "---" >> deployments/l2sm-deployment.yaml # Add a document separator before appending
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default >> deployments/l2sm-deployment.yaml $(KUSTOMIZE) build config/default >> deployments/l2sm-deployment.yaml
echo "---" >> deployments/l2sm-deployment.yaml # Add a document separator before appending
$(KUSTOMIZE) build config/tmp >> deployments/l2sm-deployment.yaml $(KUSTOMIZE) build config/tmp >> deployments/l2sm-deployment.yaml
......
# Copyright 2024 Universidad Carlos III de Madrid
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
   
--- ---
apiVersion: v1 apiVersion: v1
...@@ -9893,6 +9879,7 @@ webhooks: ...@@ -9893,6 +9879,7 @@ webhooks:
resources: resources:
- pods - pods
sideEffects: None sideEffects: None
---
apiVersion: k8s.cni.cncf.io/v1 apiVersion: k8s.cni.cncf.io/v1
kind: NetworkAttachmentDefinition kind: NetworkAttachmentDefinition
metadata: metadata:
......