Skip to content

Commit

Permalink
Removed old portal JS
Browse files Browse the repository at this point in the history
enable reconciling azuresubnets/NSGs by default

refector e2e for removing dependency.

Update 2

removed old code.

make test to fail on getting error.

Expect(err).NotTo(HaveOccurred())

Formating done

White-spaces removed.

handle the use of the AddressPrefixes field alongside AddressPrefix

improved ValidateCIDRRanges test

add vnet names to help with debugging if needed in the future

comment improvement

Bump follow-redirects from 1.14.0 to 1.14.7 in /portal

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.0...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Store downloaded cert only when it differs

When systemd downloader downloads fresh certificate
check whether it differs from the stored one.

Replace old one with fresh when there is a difference.

Signed-off-by: Petr Kotas <[email protected]>

Restart mdm service on cert change

Forces MDM container to pick up changed certificate.

Signed-off-by: Petr Kotas <[email protected]>

doc: Document fp cert rotation

Add doc file with information how the first party certificate is
rotated in the RP and on the host VM.

Signed-off-by: Petr Kotas <[email protected]>

Replace artifacts with direct code checkout

Replaces configuration fetching via build pipeline with
direct code checkout.

Signed-off-by: Petr Kotas <[email protected]>

Update .pipelines/int-release.yml

Co-authored-by: Ben Vesel <[email protected]>

provide the ability to specify an overridden fluentbit image in operator feature flags

Download aro deployer from tagged image

Pull aro deployer from tagged container instead of pipeline artifact.

Signed-off-by: Petr Kotas <[email protected]>

Add deploy pipelines using tag

Add new pipelines using tagged deployment

Signed-off-by: Petr Kotas <[email protected]>

Set XDG_RUNTIME_DIR explicitly on CI VMs

Add tagged aro image

Add annotated tag build and push into makefile.
Without annotation, the TAG is empty and
action is not performed.

Signed-off-by: Petr Kotas <[email protected]>

Build and push tagged aro image into ACR

When annotated TAG is not set the new step fails.
Otherwise it builds the tagged image and pushes it
to the ACR.

Signed-off-by: Petr Kotas <[email protected]>

Build release on tag

When CI started from tag build image and push to registry.
Extract annotation from the tag and use it as summary
for changelog. Automated summary is extracted from commits
titles.

Signed-off-by: Petr Kotas <[email protected]>

mdm/mdsd++

make generate

Revert "[PIPELINES 4] Create release based on annotated git tag"

Fix: Broken pull path

The original path is not working as it is blocked for writing,
Using the pipeline default instead

Signed-off-by: Petr Kotas <[email protected]>

Fix: Broken checkout code path

The checkout behaves differently when checking out single repository.
It checkout to /s

Signed-off-by: Petr Kotas <[email protected]>

Update prod pipeline params to be consistent

Enable SBOM on all OneBranch pipelines

Fixing typo in paths

Add Documentation and Scripts for ARO Monitor Metric testing

Fix typo

Co-authored-by: Caden Marchese <[email protected]>

Handle cleanup of spawned processes.

Clarify a few things in the procdure.

Add example script to directly inject test data

Revert "Revert "[PIPELINES 4] Create release based on annotated git tag""

Fix: Remove build to run after e2e

Signed-off-by: Petr Kotas <[email protected]>

Bump nanoid from 3.1.22 to 3.2.0 in /portal

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.22 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.1.22...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Add uaenorth to non-zonal regions

imageconfig controller

Fixing bug where incorrect ACR domain name was being generated

added doc for cert rotation

Signed-off-by: Karan.Magdani <[email protected]>

Vendor installer release 4.9

This also forces the RP from Go 1.14 to Go 1.16.

Aside from requiring OCP 4.9 / Kubernetes 1.22 modules, the
other go.mod changes are all manual workarounds from failed
"make vendor" runs.

Automated updates from "make vendor"

Alter client-gen command to stay within repo

The way this is written seems to assume the ARO-RP repo is cloned
under the user's $GOPATH tree.  That's not where I typically clone
git repos for development.

Use relative paths in the client-gen command and arguments to stay
within the ARO-RP git repo.

Automated updates from "make generate"

Set InstallStream to OCP 4.9.8

Automated updates from "make discoverycache"

pipelines: Demand agents with go-1.16 capability for CI/E2E

Update documentation for Go 1.16 and installer 4.9

Fix: Remove the wrong git pull path

Removes the wrong git pull path for ADO RP-config
Removes unused parameter

Signed-off-by: Petr Kotas <[email protected]>

fix: Add go1.16 requirement to run pipelines

With addition of 4.9 release, the go build
have to run with go1.16

Signed-off-by: Petr Kotas <[email protected]>

Add geneva action to reconcile a failed NIC

Suppress stderr within Makefile command

Do not overwrite FIPs environment variable in CI VMs

fix: fix service connection to the github

existing service connection does not meet requirement
for the github release

Signed-off-by: Petr Kotas <[email protected]>

ADO Pipelines make no sense

Ensure TAG environment var is consistent case

Incorrect quoting on variables in pipeline

Clean up debug print statement in pipelines

Add INT/Prod variable group requirements

Update correct directory path for pipeline template files

Update release tag pipeline parameters

Vendor updated autorest adal to fix nil pointer exception in MSI

add fl to owners :-)

Fix: use the correct variable syntax for updated variables in pipelines

Bump 4.9.8 to 4.9.9 as it contains a bugfix that prevents cluster creation success

Vendor openshift installer carry patch

Bump golang version to 1.16 in CI VMs

Fix wrongly updated parameters and variables in prod release

Feedback follow up on image config controller

Use INT E2E Creds in Prod pipeline as we pull from the INT image registry and spin up our resources in our INT sub

clean temporary gomock folders (Azure#1912)

Signed-off-by: Karan.Magdani <[email protected]>

fix 2 cred scan findings by adding suppression settings (Azure#1960)

add tsaoptions json file, enable tsa in build rp official pipeline (Azure#1959)

chore: removed logging onebranch pipelines files from aro-rp repo (Azure#1942)

quick fixes in docs (Azure#1956)

Removes unneeded field (Azure#1962)

Updated linux container image for build (Azure#1964)

Updating go-toolset tag to 1.16.12 (Azure#1965)

Bump follow-redirects from 1.14.7 to 1.14.8 in /portal

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

add fips validation scripts and ci step

drop net_raw and make generate

Adding norwaywest to deploy from tag ALL regions Pipeline. (Azure#1968)

Include variable groups for prod single region release (Azure#1957)

Add Central US EUAP to nonZonalRegions (Azure#1927)

remove network acceleration due to issues discovered

reapply the primary tag

make generate

Add metric gauge for nohost present on request to gateway

Fix net_raw caps, make generate (Azure#1971)

Refactors operator requeues

* Adds the clarifying comment on requeues into the checker controller
* Removes `Requeue: true` in places where we use `RequeueAfter`
  as it is has no effect.

add a field to indicate spotInstances in node.conditions metric (Azure#1928)

Bump url-parse from 1.5.3 to 1.5.7 in /portal

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

docs: add cleaner info to shared env docs

add westus3 to pipeline manifests

add additional logging to redeploy to help understand state when this job fails in e2e

Re-enable Egress Lockdown

Enable egress lockdown feature by default on new clusters while also
allowing current clusters to be admin-upgraded with the new feature

Co-authored-by: Ben Vesel <[email protected]>

fix: use the tag/commit as the aro version

ARO uses both tags and commits as its version.
The commits are used for the development scenario,
tags are used when building and deploing to
production.

add: copy ARO iamge to integration

Signed-off-by: Petr Kotas <[email protected]>

add: release pipeline documentation

Signed-off-by: Petr Kotas <[email protected]>

fix: HTTP 500 from "List cluster Azure resource" Geneva Action for unknown resource types (Azure#1978)

* If don't have an apiVersion defined for a resource, then skip over it instead of returning an error.

* Reword the comment.

* Double quote the resource type in the log warning message.

Co-authored-by: Mikalai Radchuk <[email protected]>

add operator storage acc and endpoints reconcilers

operator tests

storageacc handling for install/update

generate

vendor

review feedback

Add dev env rules exception

Comply with the Authorizer changes

Fix tests

Fix merge conflicts

Add operator flags

Fix tests

Change operator flags

Addressing feedback

generate

Operator flag tests

Addressing feedback

FIx

update cluster spec

Add an Operator controller for Managed Upgrade Operator

add MUO deployment manifests

run go generate

add a mocks directory in the operator

make dynamichelper produce less spurious changes for MUO

fix: move int mirroring to separate pipelines

integration requires it own set of credentials,
this can only by provided in a separate pipeline

Signed-off-by: Petr Kotas <[email protected]>

fix: provide the correct dependent pipeline (Azure#1982)

Signed-off-by: Petr Kotas <[email protected]>

Update mirror-aro-to-int.yml for Azure Pipelines

Remove unused parameter

fix: replace parameter with variable (Azure#1984)

Signed-off-by: Petr Kotas <[email protected]>

Update mirror-aro-to-int.yml for Azure Pipelines

Fix typo

Cleans up unused args in `muo.NewReconciler`

Bump url-parse from 1.5.7 to 1.5.10 in /portal

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Removes a explicit `gomock.Eq()` matcher calls (Azure#1983)

`gomock.Eq()` is a default matcher in gomock
so it doesn't have to be explicitly called in these cases

Docs: Set GOPATH (Azure#1987)

- A few developers on various OS flavors have seen make generate fail after the upgrade to golang 1.16 due to client-gen updates. This appears to fix.

Adds extra fields to the PreviewFeature CRD

Adds the controller implementation

It currently implements only one feature: NSG flow logs

preview feature controller and NSG flow log feature implementation

L series support - RP changes (Azure#1751)

* add L-series SKUs to internal, admin, validate api

* make client

Add SKU availability and restriction checks to dynamic validation (Azure#1790)

* add sku filtering and restriction checks

* add install-time instance validation

Minor ARO operator refactoring

* Gets rid of exported constants like `ENABLED` where exported constants are not required
* Gets rid of constant concatenations like `CONFIG_NAMESPACE + ".enabled"` to make search easier
* Removes unnecessary `Copy` method of `OperatorFlags` stuct as well as package level `DefaultOperatorFlags` variable.
  Introduces `DefaultOperatorFlags()` instead.

Removing call to listByResourceGroup due to flakyness in the Azure API

add validate-fips step into onebranch build rp template

exclude vuln protobuf

exclude vulnerable containerd versions

Changed CloudErrorCodes from vars to consts. (Azure#1997)

Co-authored-by: Jeremy Facchetti <[email protected]>

Add sourcebranchname to build_tag (Azure#1996)

adding a way to pass additional flags to E2E tests (Azure#1998)

Fix typo in deploy-development-rp doc (Azure#2005)

Better documentation support for multiple envs (Azure#1932)

- Now there are two env files: standard, and int-like files
  - Instructions modified for int envs to create the new file and source it
  - Fixed a small typo in the instructions that was being masked by indentation

vendor: fake operator client

Signed-off-by: Petr Kotas <[email protected]>

feature: add autosizednodes reconciler

Introduce autosizednodes reconciler which watches aro cluster object
feature flags for ReconcileAutoSizedNodes.

When feature flag is present new KubeletConfig is created enabling the
AutoSizingReserver feature which auto computes the system reserved
for nodes.

feature: add aro cluster to workaround

Adds aro cluster instance to IsRequires check
to allow for feature flags checking.

Signed-off-by: Petr Kotas <[email protected]>

feature: disable systemreserved when autosizednodes enabled

Signed-off-by: Petr Kotas <[email protected]>

Avoid AdminUpdate panic when Nodes are down (Azure#1972)

* Skip ensureAROOperator and aroDeploymentReady when the IngressProfiles data is missing, esp after cluster VM restarts as part of the update call
* Refactor Cluster Manager code to make ensureAROOperator code testable
* Add unit test for ensureAROOperator code

Co-authored-by: Ulrich Schlueter <[email protected]>

update go-cosmosdb version to incorporate the latest change (Azure#2006)

Filter out unwanted data from azure list geneva action (Azure#1969)

* filter our Microsoft.Compute/snapshots from azure list geneva action

* change filter input for test

Doc to create & push ARO Operator image to ACR/Quay (Azure#1888)

* Doc to create/push AROOperator image ACR/Quay

A document on How to create & publish ARO Operator image to ACR/Quay.

Added alternative to go get command (Azure#2015)

Update Makefile (Azure#2020)

The ARO-RP returns special characters in color encoding special character, which is not decoded as of now. This change removes the color encoding characters by default in e2e tests

Update node-selector on muo namespace

Dockerfile for MUO image (Azure#1993)

Update OB Build Pipeline to Pass Build Tag as Var (Azure#2011)

* adding release_tag functionality to support releasing by tag or commit

add managed upgrade operator configuration settings and connected MUO if allowed and a pullsecret exists

add muo config yaml

add openshift-azure-logging to the ignored namespaces

run go generate

Fix VM Redeploy Test Flake

- Removing test to check k8s Events for Node readiness
- Adding test for Azure VM readiness (power state)
- Adding test for Linux Kernel uptime to guarantee reboot

disable ipv6 router advertisements on rp/gateway vmss

Install python3 on RP and gateway VMs

make pullspec an optional flag

add enabled and managed by default
  • Loading branch information
hawkowl authored and ellis-johnson committed Oct 6, 2022
1 parent 485c171 commit 08e48b5
Show file tree
Hide file tree
Showing 469 changed files with 37,474 additions and 51,753 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @jewzaam @m1kola @bennerv @hawkowl @rogbas @petrkotas @ross-bryan @darthhexx @jharrington22 @cblecker
* @jewzaam @m1kola @bennerv @hawkowl @mwoodson @rogbas @petrkotas @bryanro92
2 changes: 1 addition & 1 deletion .pipelines/build-and-push-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- job: Build_and_push_images
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16

steps:
- template: ./templates/template-checkout.yml
Expand Down
23 changes: 14 additions & 9 deletions .pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ variables:
- template: vars.yml

jobs:

- job: Python_Unit_Tests
pool:
name: ARO-CI
Expand All @@ -36,7 +37,7 @@ jobs:
- job: Golang_Unit_Tests
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16
steps:
- template: ./templates/template-checkout.yml

Expand All @@ -46,6 +47,18 @@ jobs:
[[ -z "$(git status -s)" ]]
displayName: ⚙️ Run Golang code generate
- script: |
set -xe
make validate-go
[[ -z "$(git status -s)" ]]
displayName: 🕵️ Validate Golang code
- script: |
set -xe
make lint-go
[[ -z "$(git status -s)" ]]
displayName: 🕵️ Lint Golang code
- script: |
set -xe
make build-all
Expand Down Expand Up @@ -82,11 +95,3 @@ jobs:
failIfCoverageEmpty: false
condition: succeededOrFailed()

- job: Lint_Admin_Portal
pool:
name: ARO-CI
steps:
- script: |
set -xe
make lint-admin-portal
displayName: 🧹 Lint Admin Portal
2 changes: 1 addition & 1 deletion .pipelines/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeoutInMinutes: 180
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16
steps:
- template: ./templates/template-checkout.yml
- template: ./templates/template-az-cli-login.yml
Expand Down
23 changes: 20 additions & 3 deletions .pipelines/generate-release-notes-tagged.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
# Azure DevOps Pipeline for generating release notes
# Azure DevOps Pipeline building rp images and pushing to int acr
trigger: none
pr: none

variables:
- template: vars.yml
- name: TAG
- group: PROD CI Credentials

jobs:
- job: Generate_release_notes
- job: Build_and_push_images
condition: startsWith(variables['build.sourceBranch'], 'refs/tags/v2')
displayName: Generate release notes
displayName: Build release
pool:
name: ARO-CI
demands: go-1.16

steps:
- template: ./templates/template-checkout.yml
- template: ./templates/template-az-cli-login.yml
parameters:
azureDevOpsJSONSPN: $(aro-v4-ci-devops-spn)

Expand All @@ -27,6 +31,19 @@ jobs:
## set the variable
echo "##vso[task.setvariable variable=TAG]${TAG}"
- template: ./templates/template-push-images-to-acr-tagged.yml
parameters:
rpImageACR: $(RP_IMAGE_ACR)
imageTag: $(TAG)

- template: ./templates/template-az-cli-logout.yml
- script: |
cp -a --parents aro "$(Build.ArtifactStagingDirectory)"
displayName: Copy artifacts
- task: PublishBuildArtifacts@1
displayName: Publish Artifacts
name: aro_deployer

- script: |
set -xe
MESSAGE="$(git for-each-ref refs/tags/${TAG} --format='%(contents)')"
Expand Down
10 changes: 2 additions & 8 deletions .pipelines/mirror-aro-to-int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
condition: startsWith(variables['build.sourceBranch'], 'refs/tags/v2')
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16

steps:
- template: ./templates/template-checkout.yml
Expand All @@ -37,14 +37,8 @@ jobs:
## set the variable
echo "##vso[task.setvariable variable=TAG]${TAG}"
- script: |
USERNAME=`echo "$(aro-v4-ci-pd-pull)" | base64 -d | cut -d':' -f1`
PASSWORD=`echo "$(aro-v4-ci-pd-pull)" | base64 -d | cut -d':' -f2-`
az acr login --name "${{variables.rpIntImageAcr}}"
az acr import \
--force \
--name "${{variables.rpIntImageAcr}}" \
--source "${{variables.rpProdImageAcr}}.azurecr.io/aro:${TAG}" \
--username "$USERNAME" \
--password "$PASSWORD"
--source "${{variables.rpProdImageAcr}}.azurecr.io/aro:${TAG}"
- template: ./templates/template-az-cli-logout.yml
3 changes: 1 addition & 2 deletions .pipelines/onebranch/pipeline.buildrp.official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ pr: none

variables:
Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.17.7-13 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
LinuxContainerImage: cdpxlinux.azurecr.io/user/aro/ubi8-gotoolset-1.16.12-4:20220202 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
Debian_Frontend: noninteractive

resources:
Expand Down
5 changes: 2 additions & 3 deletions .pipelines/onebranch/pipeline.buildrp.pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ trigger: none
pr: none

variables:
Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io
LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.17.7-13 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
LinuxContainerImage: cdpxlinux.azurecr.io/user/aro/ubi8-gotoolset-1.16.12-4:20220202 # Docker image which is used to build the project https://aka.ms/obpipelines/containers
Debian_Frontend: noninteractive

resources:
Expand Down
3 changes: 0 additions & 3 deletions .pipelines/prod-release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ stages:
rpMode: ''
aroVersionStorageAccount: $(aro-version-storage-account)
locations:
- australiacentral
- australiacentral2
- australiaeast
- australiasoutheast
- centralindia
Expand Down Expand Up @@ -109,7 +107,6 @@ stages:
- northeurope
- norwayeast
- norwaywest
- swedencentral
- switzerlandnorth
- switzerlandwest
- westeurope
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/templates/template-job-deploy-azure-env-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- template: ../vars.yml
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16
environment: ${{ parameters.environment }}
strategy:
runOnce:
Expand All @@ -36,7 +36,7 @@ jobs:
azureDevOpsJSONSPN: $(aro-v4-ci-devops-spn)
- script: |
set -e
trap 'set +e; for c in $(docker ps -aq); do docker rm -f $c; done; docker image prune -af ; rm -rf ~/.docker/config.json; rm -rf /run/user/$(id -u $USERNAME)/containers/auth.json' EXIT
trap 'set +e; for c in $(docker ps -aq); do docker rm -f $c; done; docker image prune -af ; rm -rf ~/.docker/config.json' EXIT
export TAG=${{ parameters.imageTag }}
export RP_IMAGE_ACR=${{ parameters.rpImageAcr }}
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/templates/template-job-deploy-azure-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- template: ../vars.yml
pool:
name: ARO-CI
demands: go-1.17
demands: go-1.16
environment: ${{ parameters.environment }}
strategy:
runOnce:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
steps:
- script: |
set -e
trap 'set +e; for c in $(docker ps -aq); do docker rm -f $c; done; docker image prune -af ; rm -rf ~/.docker/config.json; rm -rf /run/user/$(id -u $USERNAME)/containers/auth.json' EXIT
trap 'set +e; for c in $(docker ps -aq); do docker rm -f $c; done; docker image prune -af ; rm -rf ~/.docker/config.json' EXIT
export RP_IMAGE_ACR=${{ parameters.rpImageACR }}
export TAG=${{ parameters.imageTag }}
az acr login --name "$RP_IMAGE_ACR"
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.aro-multistage
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# Currently the docker version on our RHEL7 VMSS uses a version which
# does not support multi-stage builds. This is a temporary stop-gap
# until we get podman working without issue
ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.17.7 AS builder
FROM registry.access.redhat.com/ubi7/go-toolset:1.16.12 AS builder
ENV GOOS=linux \
GOPATH=/go/
WORKDIR ${GOPATH}/src/github.com/Azure/ARO-RP
Expand All @@ -14,7 +13,7 @@ RUN yum update -y
COPY . ${GOPATH}/src/github.com/Azure/ARO-RP/
RUN make aro && make e2e.test

FROM ${REGISTRY}/ubi8/ubi-minimal
FROM registry.access.redhat.com/ubi7/ubi-minimal
RUN microdnf update && microdnf clean all
COPY --from=builder /go/src/github.com/Azure/ARO-RP/aro /go/src/github.com/Azure/ARO-RP/e2e.test /usr/local/bin/
ENTRYPOINT ["aro"]
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.muo
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG REGISTRY
FROM ${REGISTRY}/ubi8/go-toolset:1.16.12 AS builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12 AS builder
ARG MUOVERSION
ENV DOWNLOAD_URL=https://github.com/openshift/managed-upgrade-operator/archive/${MUOVERSION}.tar.gz
ENV GOOS=linux \
Expand All @@ -13,7 +12,7 @@ RUN curl -Lq $DOWNLOAD_URL | tar -xz --strip-components=1
RUN go build -gcflags="all=-trimpath=/go/" -asmflags="all=-trimpath=/go/" -tags mandate_fips -o build/_output/bin/managed-upgrade-operator ./cmd/manager

#### Runtime container
FROM ${REGISTRY}/ubi8/ubi-minimal:latest
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

ENV USER_UID=1001 \
USER_NAME=managed-upgrade-operator
Expand Down
Loading

0 comments on commit 08e48b5

Please sign in to comment.